Fix JENKINS-20660 - null pointer exception on first run after upgrade…

… 0.8 to 0.9
jenkinsci · Nov 27, 2013 · 8899ad4 · 8899ad4
1 parent 89b6e51
commit 8899ad4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/hudson/plugins/xshell/XShellBuilder.java b/src/main/java/hudson/plugins/xshell/XShellBuilder.java
@@ -74,7 +74,7 @@ public String getTimeAllocated() {
   public XShellBuilder(final String commandLine, final Boolean executeFromWorkingDir, final String regexToKill, final String timeAllocated) {
     this.commandLine = Util.fixEmptyAndTrim(commandLine);
       this.executeFromWorkingDir = executeFromWorkingDir;
-      this.regexToKill = regexToKill;
+      this.regexToKill = regexToKill == null ? "" : regexToKill;
       this.timeAllocated = timeAllocated;
   }