[xwiki-notifications] r7793 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/ldap

[SVN]

Author: tmortagne
Date: 2008-02-18 15:15:47 +0100 (Mon, 18 Feb 2008)
New Revision: 7793

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/ldap/XWikiLDAPUtils.java
Log:
XWIKI-1079: 
* XWikiLDAPUtils.getGroupMembers(String, XWikiContext) should return null if 
provided group does not exists

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/ldap/XWikiLDAPUtils.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/ldap/XWikiLDAPUtils.java
    2008-02-18 13:55:53 UTC (rev 7792)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/ldap/XWikiLDAPUtils.java
    2008-02-18 14:15:47 UTC (rev 7793)
@@ -335,15 +335,16 @@
         }
 
         if (groupMembers == null) {
-            groupMembers = new HashMap();
+            Map members = new HashMap();
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Retrieving Members of the group: " + groupDN);
             }
 
-            boolean isGroup = getGroupMembers(groupDN, groupMembers, new 
ArrayList(), context);
+            boolean isGroup = getGroupMembers(groupDN, members, new 
ArrayList(), context);
 
             if (isGroup) {
+                groupMembers = members;
                 synchronized (cache) {
                     cache.putInCache(groupDN, groupMembers);
                 }

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications