diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2019-05-13 10:16:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-13 10:16:05 +0200 |
commit | 6ef41afe62f41069d94bf4941d2068548a505b1b (patch) | |
tree | 3441be7ebf8b184eaa7771ac2f3fcfca9898575a /configserver | |
parent | 7d2bd1cf16e9789ad7c5e506cdb2402c8fee00ce (diff) |
Revert "Throw IllegalStateException when activating (without prepare) for non…"
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java index 572a9ee92f9..aabd1fd72cb 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/Deployment.java @@ -128,7 +128,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment { TimeoutBudget timeoutBudget = new TimeoutBudget(clock, timeout); try (Lock lock = tenant.getApplicationRepo().lock(session.getApplicationId())) { if ( ! tenant.getApplicationRepo().exists(session.getApplicationId())) - throw new IllegalStateException("Application " + session.getApplicationId() + " does not exist"); + return; // Application was deleted. validateSessionStatus(session, tenant.getApplicationRepo().preparing(session.getApplicationId())); NestedTransaction transaction = new NestedTransaction(); |