add null check

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
jetty · May 29, 2021 · 44bc0e8 · 44bc0e8
1 parent 20b618d
commit 44bc0e8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...t-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionTester.java b/...t-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionTester.java
@@ -32,6 +32,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -149,7 +150,7 @@ public DistributionTester.Run start(List<String> args) throws Exception
 
         List<String> commands = new ArrayList<>();
         commands.add(getJavaExecutable());
-        commands.addAll(config.javaOptions);
+        commands.addAll(config.javaOptions == null ? Collections.emptyList() : config.javaOptions);
         commands.add("-Djava.io.tmpdir=" + workDir.toAbsolutePath().toString());
         commands.add("-jar");
         commands.add(config.jettyHome.toAbsolutePath() + "/start.jar");