summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2024-03-01 15:08:59 +0100
committerGitHub <noreply@github.com>2024-03-01 15:08:59 +0100
commit85b35878b7ed4aadb462755d1633d81a9639d787 (patch)
tree060d69ec242442503f72e7a981abe0c7c6d77ae2 /configserver
parentde9debff6543f99c10795d6046d74dc6a5e8c21d (diff)
parentb8cefc96bbc090132efbd1d3875d45d3d653cefb (diff)
Merge pull request #30372 from vespa-engine/balder/common-compress-1.26
Revert "Revert "Update dependency org.apache.commons:commons-compress…
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 5116898b795..07a8179732f 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
@@ -1107,7 +1107,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"
}
""");
}