[exo-jcr-commits] exo-jcr SVN: r5167 - core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-11-07 03:06:08 -0500 (Mon, 07 Nov 2011)
New Revision: 5167

Modified:
   core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java
   core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
Log:
EXOJCR: LDAP Org Srv : NullPointerException when creating a new user

Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java	2011-11-04 14:43:42 UTC (rev 5166)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java	2011-11-07 08:06:08 UTC (rev 5167)
@@ -22,9 +22,9 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.organization.CacheHandler;
+import org.exoplatform.services.organization.CacheHandler.CacheType;
 import org.exoplatform.services.organization.Group;
 import org.exoplatform.services.organization.User;
-import org.exoplatform.services.organization.CacheHandler.CacheType;
 import org.exoplatform.services.organization.impl.GroupImpl;
 
 import java.util.ArrayList;
@@ -183,15 +183,27 @@
       try
       {
          if (attributes == null)
+         {
             return results;
+         }
+
          Attribute attr = attributes.get(attribute);
+         if (attr == null)
+         {
+            return results;
+         }
+
          for (int x = 0; x < attr.size(); x++)
+         {
             results.add(attr.get(x));
+         }
       }
       catch (NamingException e)
       {
          if (LOG.isDebugEnabled())
+         {
             LOG.debug(e.getLocalizedMessage(), e);
+         }
       }
       return results;
    }

Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java	2011-11-04 14:43:42 UTC (rev 5166)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java	2011-11-07 08:06:08 UTC (rev 5167)
@@ -133,12 +133,6 @@
                      + " because membership type " + m.getMembershipType() + " is not exists.");
          }
 
-         // check if we already have membership record
-         if (findMembershipByUserGroupAndType(m.getUserName(), m.getGroupId(), m.getMembershipType()) != null)
-         {
-            return;
-         }
-
          for (int err = 0;; err++)
          {
             try
@@ -169,6 +163,7 @@
                   cacheHandler.put(cacheHandler.getMembershipKey(m), m, CacheType.MEMBERSHIP);
                   return;
                }
+
                // if contains membership
                List members = getAttributes(attrs, ldapAttrMapping.membershipTypeMemberValue);
                if (members.contains(userDN))