[FIXED JENKINS-30506] fix loading of nodeEligibility

jenkinsci · Oct 28, 2016 · 7d10298 · 7d10298
1 parent 19cb786
commit 7d10298
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/org/jvnet/jenkins/plugins/nodelabelparameter/NodeParameterDefinition.java b/src/main/java/org/jvnet/jenkins/plugins/nodelabelparameter/NodeParameterDefinition.java
@@ -272,10 +272,12 @@ public Object readResolve() {
             }
             defaultSlaves.add(defaultValue);
         }
-        if (ignoreOfflineNodes) {
-            nodeEligibility = new IgnoreOfflineNodeEligibility();
-        } else {
-            nodeEligibility = new AllNodeEligibility();
+        if(nodeEligibility == null) {
+            if (ignoreOfflineNodes) {
+                nodeEligibility = new IgnoreOfflineNodeEligibility();
+            } else {
+                nodeEligibility = new AllNodeEligibility();
+            }
         }
         return this;
     }