[Exist-commits] SF.net SVN: exist:[16512] trunk/eXist/src/org/exist/security/AbstractGroup. java

[<sha...@us...>]

Revision: 16512
          http://exist.svn.sourceforge.net/exist/?rev=16512&view=rev
Author:   shabanovd
Date:     2012-05-31 15:04:50 +0000 (Thu, 31 May 2012)
Log Message:
-----------
[ignore] avoid NPE

Modified Paths:
--------------
    trunk/eXist/src/org/exist/security/AbstractGroup.java

Modified: trunk/eXist/src/org/exist/security/AbstractGroup.java
===================================================================
--- trunk/eXist/src/org/exist/security/AbstractGroup.java	2012-05-31 08:27:00 UTC (rev 16511)
+++ trunk/eXist/src/org/exist/security/AbstractGroup.java	2012-05-31 15:04:50 UTC (rev 16512)
@@ -100,7 +100,8 @@
     @Override
     public boolean isManager(Account account) {
     	for (Reference<SecurityManager, Account> manager : managers) {
-    		if (manager.resolve().equals(account))
+    		Account acc = manager.resolve();
+    		if (acc != null && acc.equals(account))
     			return true;
     	}
     	return false;
@@ -160,7 +161,9 @@
     	List<Account> list = new ArrayList<Account>(managers.size());
     	
     	for (Reference<SecurityManager, Account> ref : managers) {
-    		list.add(ref.resolve());
+    		Account acc = ref.resolve();
+    		if (acc != null)
+    			list.add(acc);
     	}
         
     	return list;
@@ -174,7 +177,8 @@
         assertCanModifyGroup(subject);
 
         for(Reference<SecurityManager, Account> ref : managers) {
-            if(ref.resolve().getName().equals(account.getName())) {
+        	Account acc = ref.resolve();
+            if(acc.getName().equals(account.getName())) {
                 managers.remove(ref);
                 break;
             }

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