[gatein-commits] gatein SVN: r5207 - portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm.

Monday, 22 November 2010


Author: bdaw
Date: 2010-11-22 14:37:42 -0500 (Mon, 22 Nov 2010)
New Revision: 5207

Modified:
  
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java
Log:
GTNPORTAL-1677: NullPointerException with LDAP in GroupDAOImpl.findGroups

Modified:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java
===================================================================
---
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java	2010-11-22
16:32:04 UTC (rev 5206)
+++
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java	2010-11-22
19:37:42 UTC (rev 5207)
@@ -370,7 +370,8 @@
             {
                String id = g.getParentId();
                if ((parent == null && id == null)
-                   || (id != null && id.equals(parent.getId())))
+                  || (parent != null && id != null &&
id.equals(parent.getId()))
+                  || (parent == null && id != null &&
id.equals("/")))
                {
                   exoGroups.add(g);
                   continue;


    