svn commit: r1672470 - in /jackrabbit/oak/branches/1.2: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/ oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/

[angela]

Author: angela
Date: Thu Apr  9 19:45:30 2015
New Revision: 1672470

URL: http://svn.apache.org/r1672470
Log:
OAK-2740 : TreeTypeProvider treates optimized node type definition info as 
Ac-Content (merge 1672468 into 1.2 branch)

Added:
    
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContextTest.java
      - copied unchanged from r1672468, 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContextTest.java
Modified:
    jackrabbit/oak/branches/1.2/   (props changed)
    
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java

Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr  9 19:45:30 2015
@@ -1,2 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
+/jackrabbit/oak/trunk:1672468
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java?rev=1672470&r1=1672469&r2=1672470&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java
 (original)
+++ 
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java
 Thu Apr  9 19:45:30 2015
@@ -47,7 +47,11 @@ final class AuthorizationContext impleme
     @Override
     public boolean definesContextRoot(@Nonnull Tree tree) {
         String name = tree.getName();
-        return POLICY_NODE_NAMES.contains(name) || 
REP_PERMISSION_STORE.equals(name);
+        if (POLICY_NODE_NAMES.contains(name)) {
+            return NT_REP_ACL.equals(TreeUtil.getPrimaryTypeName(tree));
+        } else {
+            return REP_PERMISSION_STORE.equals(name);
+        }
     }
 
     @Override