Merge pull request #26 from gostaj/master

Fixed NullPointerException when filling attributes in empty group
innoq · Jan 24, 2017 · d18c88d · d18c88d
2 parents 49dbb7e + 191a3ba
commit d18c88d
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/ldap-connector/src/main/java/com/innoq/ldap/connector/LdapHelper.java b/ldap-connector/src/main/java/com/innoq/ldap/connector/LdapHelper.java
@@ -1134,12 +1134,16 @@ private LdapGroup fillAttributesInGroup(LdapGroup group, Attributes attributes)
                     group.setCn(getAttributeOrNa(attributes, key));
                 }
             }
-            NamingEnumeration<?> members = attributes.get(groupMemberAttribut).getAll();
-            while (members.hasMoreElements()) {
-                String memberDN = (String) members.nextElement();
-                member = new LdapUser(getUidForDN(memberDN), this);
-                member.setDn(memberDN);
-                group.addUser(member);
+
+	    Attribute membersAttribute = attributes.get(groupMemberAttribut);
+	    if (membersAttribute != null) {
+	    	NamingEnumeration<?> members = membersAttribute.getAll();
+            	while (members.hasMoreElements()) {
+                    String memberDN = (String) members.nextElement();
+                    member = new LdapUser(getUidForDN(memberDN), this);
+                    member.setDn(memberDN);
+                    group.addUser(member);
+		}
             }
         } catch (NamingException ex) {
             handleNamingException(group, ex);