Handle null header value

1 files changed, 3 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 751f6674128..0c9ff7863bd 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
@@ -141,7 +141,9 @@ public class TestPackage {
                                       try {
                                           byte[] testsJar = ZipEntries.readFile(testPackage, "components/" + path, 1 << 30);
                                           Manifest manifest = new JarInputStream(new ByteArrayInputStream(testsJar)).getManifest();
-                                          for (String suite : manifest.getMainAttributes().getValue("X-JDisc-Test-Bundle-Categories").split(","))
+                                          String bundleCategoriesHeader = manifest.getMainAttributes().getValue("X-JDisc-Test-Bundle-Categories");
+                                          if (bundleCategoriesHeader == null) continue;
+                                          for (String suite : bundleCategoriesHeader.split(","))
                                               if ( ! suite.isBlank()) switch (suite.trim()) {
                                                   case "SystemTest": suites.add(system); break;
                                                   case "StagingSetup": suites.add(staging_setup); break;