From 9ac1c2c238b36e59e42ddb1273cb14c31a643ce9 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 22 Sep 2017 08:22:40 +0200 Subject: Do not rethrow ApplicationLockException as IllegalArgumentException --- .../java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configserver/src/main') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java index 6bd21e9cfb6..af4d998c347 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java @@ -7,6 +7,7 @@ import com.yahoo.config.model.api.HostProvisioner; import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.model.api.ModelFactory; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.ApplicationLockException; import com.yahoo.config.provision.OutOfCapacityException; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.Rotation; @@ -87,7 +88,7 @@ public abstract class ModelsBuilder { if (allApplicationModels.size() > 0 && allApplicationModels.get(0).getModel().skipOldConfigModels(now)) break; } - catch (OutOfCapacityException e) { + catch (OutOfCapacityException | ApplicationLockException e) { // Don't wrap this exception, and don't try to load other model versions as this is (most likely) // caused by the state of the system, not the model version/application combination throw e; -- cgit v1.2.3