summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2024-02-21 19:53:45 +0100
committerGitHub <noreply@github.com>2024-02-21 19:53:45 +0100
commitb8cefc96bbc090132efbd1d3875d45d3d653cefb (patch)
treedf0aa779f3c55f4ae009bef73999c477d2123abe /configserver
parente331dd862fb39dd93a9e2abf6d4fb7b3ddbde4a0 (diff)
Revert "Revert "Update dependency org.apache.commons:commons-compress to v1.26.0" MERGEOK"
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java2
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandlerTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 32f4d2b653c..a718ca951f5 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -1113,7 +1113,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
private File decompressApplication(CompressedApplicationInputStream in, File tempDir) {
try {
return in.decompress(tempDir);
- } catch (IOException e) {
+ } catch (IOException | UncheckedIOException e) {
throw new IllegalArgumentException("Unable to decompress application stream", e);
}
}
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandlerTest.java
index d4aa0676c4f..07b7fa0f244 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandlerTest.java
@@ -180,7 +180,7 @@ class ApplicationApiHandlerTest {
"""
{
"error-code": "BAD_REQUEST",
- "message": "Error preprocessing application package for test.default, session 2: services.xml does not exist in application package"
+ "message": "Unable to decompress application stream: Cannot find zip signature within the file"
}
""");
}