diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-09-27 09:14:41 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-09-27 09:14:41 +0200 |
commit | 3963d4ea24b607471f2d3fd37f136e2b6642080e (patch) | |
tree | acaceb7005d1108358a5f4b2439c43f32fc9a6f6 /controller-server | |
parent | a295d10844b7534bb12f4a18ee2054e54d08c003 (diff) |
Conform to style
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java index 994f47ab004..3cff6ac2430 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java @@ -203,31 +203,31 @@ public class JobController { * Accepts and stores a new application package and test jar pair under a generated application version key. */ public ApplicationVersion submit(ApplicationId id, SourceRevision revision, - byte[] applicationPackage, byte[] applicationTestPackage) { + byte[] packageBytes, byte[] testPackageBytes) { AtomicReference<ApplicationVersion> version = new AtomicReference<>(); controller.applications().lockOrThrow(id, application -> { + if ( ! application.get().deploymentJobs().builtInternally()) { + // Copy all current packages to the new application store + application.get().deployments().values().stream() + .map(Deployment::applicationVersion) + .distinct() + .forEach(appVersion -> { + byte[] content = controller.applications().artifacts().getApplicationPackage(application.get().id(), appVersion.id()); + controller.applications().applicationStore().putApplicationPackage(application.get().id(), appVersion.id(), content); + }); + } + long run = nextBuild(id); version.set(ApplicationVersion.from(revision, run)); controller.applications().applicationStore().putApplicationPackage(id, - version.get().id(), - applicationPackage); + version.get().id(), + packageBytes); controller.applications().applicationStore().putTesterPackage(testerOf(id), version.get().id(), - applicationTestPackage); - - if (!application.get().deploymentJobs().builtInternally()) { - // Copy all current packages to the new application store - application.get().deployments().values().stream() - .map(Deployment::applicationVersion) - .distinct() - .forEach(appVersion -> { - byte[] content = controller.applications().artifacts().getApplicationPackage(application.get().id(), appVersion.id()); - controller.applications().applicationStore().putApplicationPackage(application.get().id(), appVersion.id(), content); - }); - } + testPackageBytes); - controller.applications().storeWithUpdatedConfig(application.withBuiltInternally(true), new ApplicationPackage(applicationPackage)); + controller.applications().storeWithUpdatedConfig(application.withBuiltInternally(true), new ApplicationPackage(packageBytes)); notifyOfNewSubmission(id, revision, run); }); |