svn commit: r590841 - /roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java

[snoopdave]

Author: snoopdave
Date: Wed Oct 31 14:22:33 2007
New Revision: 590841

URL: http://svn.apache.org/viewvc?rev=590841&view=rev
Log:
Another tweak to global perm logic

Modified:
    
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java

Modified: 
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
URL: 
http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java?rev=590841&r1=590840&r2=590841&view=diff
==============================================================================
--- 
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
 (original)
+++ 
roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
 Wed Oct 31 14:22:33 2007
@@ -464,13 +464,11 @@
                 existingPerm = getWeblogPermission(permToCheck.getWeblog(), 
user);
             } catch (WebloggerException ignored) {}        
         }
-
-        if (existingPerm == null) {
-            // user has no existing perm in a weblog, so try his global perms
-            existingPerm = new GlobalPermission(user);
-        }
+        if (existingPerm != null && existingPerm.implies(perm)) return true;  
         
-        if (existingPerm.implies(perm)) return true;
+        // user has no existing perm in a weblog, so try his global perms
+        GlobalPermission globalPerm = new GlobalPermission(user);
+        if (globalPerm.implies(perm)) return true;
         
         if (log.isDebugEnabled()) {
             log.debug("PERM CHECK FAILED: user "+user.getUserName()+" does not 
have " + perm.toString());