[JENKINS-14281] On Windows domain can be a null field

jenkinsci · Mar 14, 2017 · 2711542 · 2711542 · uhafner · Mar 14, 2017
1 parent 44528ab
commit 2711542
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/main/java/hudson/plugins/active_directory/ActiveDirectorySecurityRealm.java b/src/main/java/hudson/plugins/active_directory/ActiveDirectorySecurityRealm.java
@@ -325,17 +325,21 @@ public Object readResolve() throws ObjectStreamException {
                 this.domains.add(new ActiveDirectoryDomain(oldDomain, server));
             }
         }
-        // JENKINS-39375 Support a different bindUser per domain
-        if (bindName != null && bindPassword != null) {
-            for (ActiveDirectoryDomain activeDirectoryDomain : this.getDomains()) {
-                activeDirectoryDomain.bindName = bindName;
-                activeDirectoryDomain.bindPassword = bindPassword;
+        List <ActiveDirectoryDomain> activeDirectoryDomains = this.getDomains();
+        // JENKINS-14281 On Windows domain can be indeed null
+        if (activeDirectoryDomains!= null) {
+            // JENKINS-39375 Support a different bindUser per domain
+            if (bindName != null && bindPassword != null) {
+                for (ActiveDirectoryDomain activeDirectoryDomain : activeDirectoryDomains) {
+                    activeDirectoryDomain.bindName = bindName;
+                    activeDirectoryDomain.bindPassword = bindPassword;
+                }
             }
-        }
-        // JENKINS-39423 Make site independent of each domain
-        if (site != null) {
-            for (ActiveDirectoryDomain activeDirectoryDomain : this.getDomains()) {
-                activeDirectoryDomain.site = site;
+            // JENKINS-39423 Make site independent of each domain
+            if (site != null) {
+                for (ActiveDirectoryDomain activeDirectoryDomain : activeDirectoryDomains) {
+                    activeDirectoryDomain.site = site;
+                }
             }
         }
         if (startTls == null) {