svn commit: r1669128 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java

[angela]

Author: angela
Date: Wed Mar 25 14:38:20 2015
New Revision: 1669128

URL: http://svn.apache.org/r1669128
Log:
OAK-2674 : Fix FindBug Issues, Fix annotation with NodeUtil#getParent()

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java?rev=1669128&r1=1669127&r2=1669128&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java
 Wed Mar 25 14:38:20 2015
@@ -77,7 +77,7 @@ public class NodeUtil {
         return mapper.getJcrName(tree.getName());
     }
 
-    @CheckForNull
+    @Nonnull
     public NodeUtil getParent() {
         return new NodeUtil(tree.getParent(), mapper);
     }
@@ -167,6 +167,9 @@ public class NodeUtil {
                         target = target.addChild(segment, primaryTypeName);
                     }
                 }
+                if (target == null) {
+                    throw new AccessDeniedException();
+                }
                 return target;
             } else {
                 return new NodeUtil(t);