svn commit: r1537376 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java

[tripod]

Author: tripod
Date: Thu Oct 31 04:41:09 2013
New Revision: 1537376

URL: http://svn.apache.org/r1537376
Log:
OAK-1135 NPE in CompiledPermissionImpl.getTreePermission()

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

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java?rev=1537376&r1=1537375&r2=1537376&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
 Thu Oct 31 04:41:09 2013
@@ -206,6 +206,10 @@ final class CompiledPermissionImpl imple
                             tl = tl.getParent();
                         }
                         Tree versionableTree = tl.getTree();
+                        if (versionableTree == null) {
+                            // for PropertyLocations
+                            versionableTree = tl.getParent().getTree();
+                        }
                         TreePermission pp = 
getParentPermission(versionableTree, TreeTypeProvider.TYPE_VERSION);
                         return new TreePermissionImpl(versionableTree, 
TreeTypeProvider.TYPE_VERSION, pp);
                     }