From 65449f052047582366406922a4cae7abdc8e1e4e Mon Sep 17 00:00:00 2001
From: andreer <andreer@verizonmedia.com>
Date: Thu, 27 Jun 2019 11:27:26 +0200
Subject: don't wrap transient exceptions (like CertificateNotReadyException)

---
 .../src/main/java/com/yahoo/vespa/model/VespaModelFactory.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'config-model')

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;
         }
-- 
cgit v1.2.3