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

[do-not-reply at jboss.org]

Author: mpodolin
Date: 2010-03-25 06:53:23 -0400 (Thu, 25 Mar 2010)
New Revision: 2363

Modified:
   portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java
Log:
JBEPP-236: GTNPORTAL-886 ported to the EPP branch

Modified: portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java
===================================================================
--- portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java	2010-03-25 10:36:57 UTC (rev 2362)
+++ portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java	2010-03-25 10:53:23 UTC (rev 2363)
@@ -261,7 +261,15 @@
          // Check if attribute is part of User interface data
          if (!UserDAOImpl.USER_NON_PROFILE_KEYS.contains(key))
          {
-            filteredAttrs.put(key, attrs.get(key).getValue().toString());
+            Object value = attrs.get(key).getValue();
+            if (value != null)
+            {
+               filteredAttrs.put(key, value.toString());
+            }
+            else
+            {
+               filteredAttrs.put(key, null);
+            }
          }
 
       }