[JENKINS-17318] Upon resolving NullPointerException, the java path ge…

…nerated was malformed.
jenkinsci · Mar 23, 2013 · e63aa87 · e63aa87
1 parent 1786f58
commit e63aa87
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/fitnesse/FitnesseExecutor.java b/src/main/java/hudson/plugins/fitnesse/FitnesseExecutor.java
@@ -83,12 +83,13 @@ private Proc startFitnesse(AbstractBuild<?,?> build, Launcher launcher, EnvVars
 
 	public ArrayList<String> getJavaCmd(FilePath workingDirectory, EnvVars envVars) {
 		String java = "java"; 
-		if (envVars.containsKey("JAVA_HOME"))
-			java = new File(new File(envVars.get("JAVA_HOME"), "bin"), java).getAbsolutePath();
 		if(!builder.getFitnesseJdk().isEmpty()){
 		   File customJavaHome = Hudson.getInstance().getJDK(builder.getFitnesseJdk()).getBinDir();
 		   java = new File(customJavaHome, java).getAbsolutePath();
+		} else if (envVars.containsKey("JAVA_HOME")) {
+			java = new File(new File(envVars.get("JAVA_HOME"), "bin"), java).getAbsolutePath();
 		}
+
 		String fitnesseJavaOpts = builder.getFitnesseJavaOpts();
 		String[] java_opts = ("".equals(fitnesseJavaOpts) ? new String[0] : fitnesseJavaOpts.split(" "));