svn commit: r590788 - /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 12:05:43 2007
New Revision: 590788

URL: http://svn.apache.org/viewvc?rev=590788&view=rev
Log:
Correcting the existing 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=590788&r1=590787&r2=590788&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 12:05:43 2007
@@ -465,8 +465,8 @@
             } catch (WebloggerException ignored) {}        
         }
 
-        if (perm instanceof GlobalPermission) {
-            // if user has specified global permission return true
+        if (existingPerm == null) {
+            // user has no existing perm in a weblog, so try his global perms
             existingPerm = new GlobalPermission(user);
         }