[Openutils-svn] SF.net SVN: openutils: [667] trunk/openutils-hibernate-security/src/main/ java/it/openutils/hibernate/security/filter

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

Revision: 667
          http://openutils.svn.sourceforge.net/openutils/?rev=667&view=rev
Author:   fcarone
Date:     2008-02-20 07:55:57 -0800 (Wed, 20 Feb 2008)

Log Message:
-----------
Various enhancements

Modified Paths:
--------------
    trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAfterInvocationHandler.java
    trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRulePredicate.java
    trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleUtils.java

Modified: trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAfterInvocationHandler.java
===================================================================
--- trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAfterInvocationHandler.java	2008-02-20 15:36:56 UTC (rev 666)
+++ trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleAfterInvocationHandler.java	2008-02-20 15:55:57 UTC (rev 667)
@@ -5,7 +5,6 @@
 
 import it.openutils.hibernate.security.services.SecurityRuleManager;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;

Modified: trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRulePredicate.java
===================================================================
--- trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRulePredicate.java	2008-02-20 15:36:56 UTC (rev 666)
+++ trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRulePredicate.java	2008-02-20 15:55:57 UTC (rev 667)
@@ -11,8 +11,6 @@
 import org.acegisecurity.Authentication;
 import org.acegisecurity.ConfigAttributeDefinition;
 import org.apache.commons.collections.Predicate;
-import org.apache.commons.lang.StringUtils;
-import org.hibernate.proxy.HibernateProxy;
 
 
 /**
@@ -61,7 +59,7 @@
         {
             return false;
         }
-        return (ruleUtils.checkRules(rules, object) && ruleUtils.checkPermissions(rules, configAttribute));
+        return (ruleUtils.checkPermissions(rules, configAttribute) && ruleUtils.checkRules(rules, object));
     }
 
 

Modified: trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleUtils.java
===================================================================
--- trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleUtils.java	2008-02-20 15:36:56 UTC (rev 666)
+++ trunk/openutils-hibernate-security/src/main/java/it/openutils/hibernate/security/filter/SecurityRuleUtils.java	2008-02-20 15:55:57 UTC (rev 667)
@@ -82,13 +82,14 @@
                             log.debug("Matching rule found: {}", rule);
                             return true;
                         }
-
+                        break;
                     case NOT:
                         if (!StringUtils.equals(objProperty, rule.getValue()))
                         {
                             log.debug("Matching rule found: {}", rule);
                             return true;
                         }
+                        break;                        
                     default:
                         throw new RuntimeException("Modifier " + rule.getModifier() + " is not recognized");
                 }


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