Fixed an NPE

arunsure · Feb 6, 2015 · 19b048d · 19b048d
1 parent c6ca88f
commit 19b048d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplate.java b/jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplate.java
@@ -301,7 +301,7 @@ public NodeMetadata get() {
                     .authorizeAdminPublicKey(true).adminPublicKey(getCloud().publicKey).adminHome(getFsRoot()).build();
 
             // Jenkins needs /jenkins dir.
-            Statement jenkinsDirStatement = Statements.newStatementList(Statements.exec("mkdir -p " + getFsRoot()),
+            Statement jenkinsDirStatement = newStatementList(Statements.exec("mkdir -p " + getFsRoot()),
                     Statements.exec("chown " + getJenkinsUser() + " " + getFsRoot()));
 
             initStatement = newStatementList(adminAccess, jenkinsDirStatement, Statements.exec(this.initScript));
@@ -310,7 +310,11 @@ public NodeMetadata get() {
         if (preInstalledJava) {
             bootstrap = initStatement;
         } else {
-            bootstrap = newStatementList(initStatement, InstallJDK.fromOpenJDK());
+            if (null == initStatement) {
+                bootstrap = newStatementList(InstallJDK.fromOpenJDK());
+            } else {
+                bootstrap = newStatementList(initStatement, InstallJDK.fromOpenJDK());
+            }
         }
 
         options.inboundPorts(22).userMetadata(userMetadata);