[Yanel-commits] rev 48838 - public/yanel/trunk/src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi

[michi at wyona.com]

Author: michi
Date: 2010-04-15 22:56:39 +0200 (Thu, 15 Apr 2010)
New Revision: 48838

Modified:
   public/yanel/trunk/src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java
Log:
only set attribute if it exists

Modified: public/yanel/trunk/src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java	2010-04-15 20:25:59 UTC (rev 48837)
+++ public/yanel/trunk/src/contributions/resources/security-api/src/java/org/wyona/yanel/impl/resources/securityapi/UserManagerResource.java	2010-04-15 20:56:39 UTC (rev 48838)
@@ -162,10 +162,17 @@
 
         for (int i = 0; i < users.length; i++) {
             sb.append("<user id=\"" + users[i].getID() + "\"");
+
             sb.append(" expired=\"" + org.wyona.security.impl.util.UserUtil.isExpired(users[i]) + "\"");
-            sb.append(" expiration-date=\"" + users[i].getExpirationDate() + "\"");
-            sb.append(" language=\"" + users[i].getLanguage() + "\"");
 
+            if (users[i].getExpirationDate() != null) {
+                sb.append(" expiration-date=\"" + users[i].getExpirationDate() + "\"");
+            }
+
+            if (users[i].getLanguage() != null) {
+                sb.append(" language=\"" + users[i].getLanguage() + "\"");
+            }
+
             // INFO: Add custom properties
             SecurityItemExtraPropertiesGetter<User> itemExtraPropertiesGetter = getUserExtraPropertiesGetter();
             Map<String, String> extraItemProperties = itemExtraPropertiesGetter.getExtraProperties(users[i]);