diff options
Diffstat (limited to 'configserver/src')
3 files changed, 4 insertions, 2 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 8a541abf4ae..d32d1a4e000 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 @@ -134,7 +134,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> { } else { if (e instanceof IllegalArgumentException) { - var wrapped = new InvalidApplicationException("Error loading " + applicationId, e); + var wrapped = new InvalidApplicationException("Invalid application", e); deployLogger.logApplicationPackage(Level.SEVERE, Exceptions.toMessageString(wrapped)); throw wrapped; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java index 8d023cac88a..4928af488e1 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java @@ -148,6 +148,8 @@ public class SessionPreparer { return preparation.result(); } catch (IllegalArgumentException e) { + if (e instanceof InvalidApplicationException) + throw e; throw new InvalidApplicationException("Invalid application package", e); } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java index 95f44bf09a1..39b1a588a17 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java @@ -294,7 +294,7 @@ public class HostedDeployTest { DeployTester tester = createTester(hosts, modelFactories, prodZone); // Not OK when failing version is requested. - assertEquals("Invalid application package", + assertEquals("Invalid application", assertThrows(IllegalArgumentException.class, () -> tester.deployApp("src/test/apps/hosted/", wantedVersion.toFullString())) .getMessage()); |