[jboss-cvs] jboss-seam/src/main/org/jboss/seam/security ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/05/09 22:04:32

  Modified:    src/main/org/jboss/seam/security  RuleBasedIdentity.java
  Log:
  update to drools 4.0.0 MR2
  
  Revision  Changes    Path
  1.10      +9 -4      jboss-seam/src/main/org/jboss/seam/security/RuleBasedIdentity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RuleBasedIdentity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/RuleBasedIdentity.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- RuleBasedIdentity.java	14 Mar 2007 16:08:31 -0000	1.9
  +++ RuleBasedIdentity.java	10 May 2007 02:04:32 -0000	1.10
  @@ -9,11 +9,13 @@
   import java.util.ArrayList;
   import java.util.Collection;
   import java.util.Enumeration;
  +import java.util.Iterator;
   import java.util.List;
   
   import org.drools.FactHandle;
   import org.drools.RuleBase;
   import org.drools.WorkingMemory;
  +import org.drools.base.ClassObjectFilter;
   import org.jboss.seam.Component;
   import org.jboss.seam.annotations.Install;
   import org.jboss.seam.annotations.Intercept;
  @@ -54,7 +56,7 @@
         
         if (securityRules != null)
         {
  -         securityContext = securityRules.newWorkingMemory(false);
  +         securityContext = securityRules.newStatefulSession(false);
         }
         
         if (securityContext == null)
  @@ -148,9 +150,10 @@
         
         if (securityContext != null)
         {
  -         for (Role role : (List<Role>) securityContext.getObjects(Role.class))
  +         Iterator<Role> iter = securityContext.iterateObjects(new ClassObjectFilter(Role.class)); 
  +         while (iter.hasNext()) 
            {
  -            getSecurityContext().retractObject(securityContext.getFactHandle(role));
  +            getSecurityContext().retractObject(securityContext.getFactHandle(iter.next()));
            }
         }
         
  @@ -181,8 +184,10 @@
         
         if (securityContext != null)
         {
  -         for (Role r : (List<Role>) getSecurityContext().getObjects(Role.class))
  +         Iterator<Role> iter = securityContext.iterateObjects(new ClassObjectFilter(Role.class)); 
  +         while (iter.hasNext()) 
            {
  +            Role r = iter.next();
               if (r.getName().equals(role))
               {
                  FactHandle fh = getSecurityContext().getFactHandle(r);