JENKINS-31690 fix for getGroovyBinding NPE

jenkinsci · Dec 28, 2015 · 719e734 · 719e734
1 parent d24321d
commit 719e734
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/...cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition.java b/...cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition.java
@@ -47,7 +47,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Property;
-import org.boon.Boon;
 import org.codehaus.groovy.control.CompilerConfiguration;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
@@ -686,11 +685,18 @@ private String computeMD5Hash(String str) {
 	}
 
 	private Binding getGroovyBinding() {
+		Binding groovyBinding = null;
+
 		StaplerRequest currentRequest = Stapler.getCurrentRequest();
-		Binding groovyBinding = (Binding)currentRequest.getAttribute(ATTR_REQUEST_GROOVY_BINDING);
-		if(groovyBinding == null) {
+		if(currentRequest != null) {
+			groovyBinding = (Binding)currentRequest.getAttribute(ATTR_REQUEST_GROOVY_BINDING);
+			if(groovyBinding == null) {
+				groovyBinding = new Binding();
+				currentRequest.setAttribute(ATTR_REQUEST_GROOVY_BINDING, groovyBinding);
+			}
+		}
+		else {
 			groovyBinding = new Binding();
-			currentRequest.setAttribute(ATTR_REQUEST_GROOVY_BINDING, groovyBinding);
 		}
 		return groovyBinding;
 	}