fixed bug jPPF-534

jppf-grid · May 18, 2018 · 4fea5fe · 4fea5fe
1 parent 3bfa00f
commit 4fea5fe
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/common/src/java/org/jppf/process/AbstractProcessLauncher.java b/common/src/java/org/jppf/process/AbstractProcessLauncher.java
@@ -45,6 +45,10 @@ public abstract class AbstractProcessLauncher extends ThreadSynchronization impl
    *
    */
   private static final Pattern JVM_OPTIONS_PATTERN = Pattern.compile("([^\"\\s]*\"[^\"]*\"[^\"\\s]*|[^\"\\s]*)\\s*");
+  /**
+   * Constant for no JVM options.
+   */
+  private static final Pair<List<String>, List<String>> NO_OPTIONS = new Pair<List<String>, List<String>>(new ArrayList<String>(), new ArrayList<String>());
   /**
    * A reference to the JPPF driver subprocess, used to kill it when the driver launcher exits.
    */
@@ -81,6 +85,7 @@ public abstract class AbstractProcessLauncher extends ThreadSynchronization impl
    * @return A list of jvm options.
    */
   protected Pair<List<String>, List<String>> parseJvmOptions(final String source) {
+    if (source == null) return NO_OPTIONS;
     final List<String> options = new ArrayList<>();
     final Matcher matcher = JVM_OPTIONS_PATTERN.matcher(source);
     while (matcher.find()) {