[JENKINS-17318] Addressed NullPointerException generated in FitnesseB…

…uilder when the EnvironmentVariablesNodeProperty was null.
jenkinsci · Mar 23, 2013 · 1786f58 · 1786f58
1 parent 006aaf6
commit 1786f58
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/hudson/plugins/fitnesse/FitnesseBuilder.java b/src/main/java/hudson/plugins/fitnesse/FitnesseBuilder.java
@@ -91,7 +91,7 @@ public String getFitnesseHost() {
 	public String getFitnesseHost(AbstractBuild<?,?> build) throws InterruptedException, IOException  {
 		if (getFitnesseStart()){
 			EnvironmentVariablesNodeProperty prop = build.getBuiltOn().getNodeProperties().get(EnvironmentVariablesNodeProperty.class);
-		  	if (prop.getEnvVars()!=null && prop.getEnvVars().get(_HOSTNAME_SLAVE_PROPERTY)!=null){
+		  	if (prop!=null && prop.getEnvVars()!=null && prop.getEnvVars().get(_HOSTNAME_SLAVE_PROPERTY)!=null){
 		  		return prop.getEnvVars().get(_HOSTNAME_SLAVE_PROPERTY);
 		  	} else {
 		  		return _LOCALHOST;