diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-04-25 11:09:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-25 11:09:01 +0200 |
| commit | bc1dce1a17658a2a96dcd6605faff98d7942215b (patch) | |
| tree | 4633ef10995cd26010ee114daeef0eaf9fabe901 /controller-server | |
| parent | 6d181bb2c03d04129361b08fdfe1c3397f488b85 (diff) | |
Update ApplicationController.java
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index 7e5ee023432..5294a80464a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -539,11 +539,6 @@ public class ApplicationController { /** Deactivate application in the given zone */ public void deactivate(Application application, ZoneId zone) { - Optional<Deployment> deployment = Optional.empty(); - if (false && deployment.isPresent() - && ! DeploymentExpirer.hasExpired(controller.zoneRegistry(), deployment.get(), clock.instant())) - return; - lockOrThrow(application.id(), lockedApplication -> store(deactivate(lockedApplication, zone))); } |