summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-04-17 14:59:00 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-04-17 14:59:00 +0200
commit360e306409954cfd42d14088323d1c0f93648d09 (patch)
treed5e367c9fcd48226d5f69c24367293bef46abfe5
parentc82744e3971ab3d31d89cb6f7a74c4c7eeef2fb4 (diff)
Lock only if present
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 8eabc5eab6c..77cbaef3a0d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -271,7 +271,7 @@ public class DeploymentTrigger {
}
// TODO jvenstad: Replace with completion of individual parts of Change.
if (completedAt.isPresent())
- applications().lockOrThrow(id, lockedApplication -> applications().store(lockedApplication.withChange(Change.empty())));
+ applications().lockIfPresent(id, lockedApplication -> applications().store(lockedApplication.withChange(Change.empty())));
});
return jobs;
}