diff options
author | andreer <andreer@verizonmedia.com> | 2019-06-27 11:27:26 +0200 |
---|---|---|
committer | andreer <andreer@verizonmedia.com> | 2019-06-27 11:27:26 +0200 |
commit | 65449f052047582366406922a4cae7abdc8e1e4e (patch) | |
tree | f0f479a6b071adf646b95af8d6201c274dad9a3a /config-model | |
parent | 2e358defd9370f19d0e19ba008ee88432549a9e1 (diff) |
don't wrap transient exceptions (like CertificateNotReadyException)
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java index f69330eb196..3e9790a81a2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModelFactory.java @@ -20,6 +20,7 @@ import com.yahoo.config.model.api.ValidationParameters; import com.yahoo.config.model.application.provider.ApplicationPackageXmlFilesValidator; import com.yahoo.config.model.builder.xml.ConfigModelBuilder; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.config.provision.TransientException; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.config.VespaVersion; import com.yahoo.vespa.model.application.validation.Validation; @@ -166,7 +167,7 @@ public class VespaModelFactory implements ModelFactory { private List<ConfigChangeAction> validateModel(VespaModel model, DeployState deployState, ValidationParameters validationParameters) { try { return Validation.validate(model, validationParameters, deployState); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException | TransientException e) { rethrowUnlessIgnoreErrors(e, validationParameters.ignoreValidationErrors()); } catch (Exception e) { throw new RuntimeException(e); @@ -174,7 +175,7 @@ public class VespaModelFactory implements ModelFactory { return new ArrayList<>(); } - private static void rethrowUnlessIgnoreErrors(IllegalArgumentException e, boolean ignoreValidationErrors) { + private static void rethrowUnlessIgnoreErrors(RuntimeException e, boolean ignoreValidationErrors) { if (!ignoreValidationErrors) { throw e; } |