diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-09-28 10:44:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 10:44:06 +0200 |
| commit | f573a944133f089b640007a61ceed96fb3a6689a (patch) | |
| tree | 9f3656a7a68086b658455369178c421b1e27a284 /configserver/src/main | |
| parent | df59841596f54ac9a7493edb61ab3166673af4c7 (diff) | |
| parent | 9ac1c2c238b36e59e42ddb1273cb14c31a643ce9 (diff) | |
Merge pull request #3496 from vespa-engine/hmusum/dont-rethrow-application-lock-exception-as-illegal-argument-exception
Do not rethrow ApplicationLockException as IllegalArgumentException
Diffstat (limited to 'configserver/src/main')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java | 3 |
1 files changed, 2 insertions, 1 deletions
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<MODELRESULT extends ModelResult> { 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; |