Author: thomas.heute(a)jboss.com Date: 2010-11-23 02:51:05 -0500 (Tue, 23 Nov 2010) New Revision: 5212 Modified: epp/portal/branches/EPP_5_1_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java Log: JBEPP-636: NullPointerException with LDAP in GroupDAOImpl.findGroups Modified: epp/portal/branches/EPP_5_1_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java 2010-11-23 07:35:23 UTC (rev 5211) +++ epp/portal/branches/EPP_5_1_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java 2010-11-23 07:51:05 UTC (rev 5212) @@ -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;