[FIX JENKINS-27496] reconfigure may return null

jenkinsci · Mar 18, 2015 · e5e3143 · e5e3143
1 parent c415857
commit e5e3143
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectJobProperty.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectJobProperty.java
@@ -88,7 +88,7 @@ private EnvInjectJobPropertyContributor[] computeEnvInjectContributors() throws
         EnvInjectJobPropertyContributor[] contributorsInstance = envInjectContributorManagement.getNewContributorsInstance();
 
         //No jobProperty Contributors ==> new configuration
-        if (contributors == null || contributors.length == 0) {
+        if (contributors == null || contributors.lerength == 0) {
             return contributorsInstance;
         }
 
@@ -132,7 +132,7 @@ public void setContributors(EnvInjectJobPropertyContributor[] jobPropertyContrib
     @Override
     public JobProperty<?> reconfigure(StaplerRequest req, JSONObject form) throws Descriptor.FormException {
         EnvInjectJobProperty property = (EnvInjectJobProperty) super.reconfigure(req, form);
-        if (property.info != null && !Jenkins.getInstance().hasPermission(Jenkins.RUN_SCRIPTS)) {
+        if (property != null && property.info != null && !Jenkins.getInstance().hasPermission(Jenkins.RUN_SCRIPTS)) {
             // Don't let non RUN_SCRIPT users set arbitrary groovy script
             property.info = new EnvInjectJobPropertyInfo(property.info.propertiesFilePath, property.info.propertiesContent,
                                                          property.info.getScriptFilePath(), property.info.getScriptContent(),