summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2022-11-04 14:55:50 +0100
committerGitHub <noreply@github.com>2022-11-04 14:55:50 +0100
commit64ccea8d9a5b92ee6bd9312a31566a028e4464a3 (patch)
treecfd325e022e1e7f2ab5c8436fb6b818a86f616e3
parent1a9ba093e5358c58765ed1df1a0dcade3c8d7c90 (diff)
parentb25654fedb1aa6e02dc76d94bb9b96c2a5e3d987 (diff)
Merge pull request #24750 from vespa-engine/jonmv/fix-test-packages
Pass through unlisted items
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java
index bb24e70b96d..f838e44bd02 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java
@@ -56,6 +56,7 @@ import static com.yahoo.vespa.hosted.controller.application.pkg.ApplicationPacka
import static com.yahoo.vespa.hosted.controller.application.pkg.ApplicationPackage.servicesFile;
import static java.io.InputStream.nullInputStream;
import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.function.UnaryOperator.identity;
import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.mapping;
import static java.util.stream.Collectors.toList;
@@ -111,7 +112,7 @@ public class TestPackage {
@Override
public InputStream modify(String name, InputStream in) {
hasLegacyTests |= name.startsWith("artifacts/") && name.endsWith("-tests.jar");
- return entries.containsKey(name) ? null : replacements.get(name).apply(in);
+ return entries.containsKey(name) ? null : replacements.getOrDefault(name, identity()).apply(in);
}
{