[seam-commits] Seam SVN: r8173 - in trunk/src/main/org/jboss/seam/security: permission and 1 other directory.

[seam-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2008-05-12 18:54:07 -0400 (Mon, 12 May 2008)
New Revision: 8173

Modified:
   trunk/src/main/org/jboss/seam/security/Role.java
   trunk/src/main/org/jboss/seam/security/permission/PersistentPermissionResolver.java
Log:
fixed incorrect logic for collection filtering, Role constructor

Modified: trunk/src/main/org/jboss/seam/security/Role.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/Role.java	2008-05-12 22:24:18 UTC (rev 8172)
+++ trunk/src/main/org/jboss/seam/security/Role.java	2008-05-12 22:54:07 UTC (rev 8173)
@@ -18,7 +18,7 @@
    public Role(String name, boolean conditional)
    {
       this(name);
-      this.conditional = true;
+      this.conditional = conditional;
    }
    
    public boolean isConditional()

Modified: trunk/src/main/org/jboss/seam/security/permission/PersistentPermissionResolver.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/PersistentPermissionResolver.java	2008-05-12 22:24:18 UTC (rev 8172)
+++ trunk/src/main/org/jboss/seam/security/permission/PersistentPermissionResolver.java	2008-05-12 22:54:07 UTC (rev 8173)
@@ -147,12 +147,12 @@
                         iter.remove();
                         break;
                      }
-                     else if (identity.hasRole(role.getName()))
-                     {
-                        iter.remove();
-                        break;
-                     }
                   }
+                  else if (identity.hasRole(role.getName()))
+                  {
+                     iter.remove();
+                     break;
+                  }
                }               
             }
          }