[Amdatu-commits] SVN r561 - trunk/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service

[subvers...@amdatu.org]

Author: ivol37 at gmail.com
Date: Wed Jan  5 10:58:52 2011
New Revision: 561

Log:
[AMDATU-241] Quick fix for NullPointerException when a user is removed that is 
also member of some group

Modified:
   
trunk/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProvider.java

Modified: 
trunk/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProvider.java
==============================================================================
--- 
trunk/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProvider.java
     (original)
+++ 
trunk/amdatu-cassandra/cassandra-useradminstore/src/main/java/org/amdatu/cassandra/useradminstore/service/CassandraStorageProvider.java
     Wed Jan  5 10:58:52 2011
@@ -353,7 +353,12 @@
             } else {
                 roleName = memberId.substring(GROUP_KEY_PREFIX.length());
             }
-            roles.add(getRole(factory, roleName));
+            Role role = getRole(factory, roleName);
+            if (role != null) {
+                // FIXME: because of AMDATU-241 a role may be null in case 
this is a group that refers to a member
+                // that has been removed in the meantime. This is a temporary 
quick-fix.
+                roles.add(getRole(factory, roleName));
+            }
         }
         return roles;
     }
@@ -426,7 +431,7 @@
             } else {
                 throw new StorageException(
                 "The current implementation of the UserAdmin only supports 
storing properties of type byte[]");
-            } 
+            }
         } catch (CassandraException e) {
             throw new StorageException(e.getMessage());
         }