[Openutils-svn] SF.net SVN: openutils: [569] trunk/openutils-usermanagement-dataobjects/src /main/java/it/openutils/usermanagement/dataobjects/User.java

[<fc...@us...>]

Revision: 569
          http://openutils.svn.sourceforge.net/openutils/?rev=569&view=rev
Author:   fcarone
Date:     2008-01-29 03:59:58 -0800 (Tue, 29 Jan 2008)

Log Message:
-----------
Avoid npes if user's groups are not in any role.

Modified Paths:
--------------
    trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/User.java

Modified: trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/User.java
===================================================================
--- trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/User.java	2008-01-27 15:25:47 UTC (rev 568)
+++ trunk/openutils-usermanagement-dataobjects/src/main/java/it/openutils/usermanagement/dataobjects/User.java	2008-01-29 11:59:58 UTC (rev 569)
@@ -110,6 +110,10 @@
         this.password = password;
     }
 
+    /**
+     * @return The set of roles related to the user. It returns null if the user is not in any group, or an empty set
+     * if the groups the user is in, do not belong to any role.
+     */
     public Set<Role> getRoles()
     {
         if (groups == null)
@@ -121,7 +125,12 @@
 
         for (Group group : groups)
         {
-            roles.addAll(group.getRoles());
+            Set<Role> groupRoles = group.getRoles();
+            if (groupRoles == null)
+            {
+                continue;
+            }
+            roles.addAll(groupRoles);
         }
 
         return roles;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.