jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1453778 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
Date Thu, 07 Mar 2013 11:26:49 GMT
Author: angela
Date: Thu Mar  7 11:26:49 2013
New Revision: 1453778

URL: http://svn.apache.org/r1453778
Log:
OAK-527: permissions (wip)

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java?rev=1453778&r1=1453777&r2=1453778&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
Thu Mar  7 11:26:49 2013
@@ -56,8 +56,7 @@ class PermissionValidator implements Val
     PermissionValidator(Tree parentBefore, Tree parentAfter,
                         PermissionProvider permissionProvider,
                         PermissionValidatorProvider provider) {
-        this(parentBefore, parentAfter, permissionProvider, provider,
-                Permissions.getPermission(getPath(parentBefore, parentAfter), Permissions.NO_PERMISSION));
+        this(parentBefore, parentAfter, permissionProvider, provider, Permissions.NO_PERMISSION);
     }
 
     PermissionValidator(Tree parentBefore, Tree parentAfter,
@@ -68,7 +67,11 @@ class PermissionValidator implements Val
         this.provider = provider;
         this.parentBefore = parentBefore;
         this.parentAfter = parentAfter;
-        this.permission = permission;
+        if (Permissions.NO_PERMISSION == permission) {
+            this.permission = Permissions.getPermission(getPath(parentBefore, parentAfter),
Permissions.NO_PERMISSION);
+        } else {
+            this.permission = permission;
+        }
     }
 
     //----------------------------------------------------------< Validator >---



Mime
View raw message