You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2012/08/20 15:52:08 UTC
svn commit: r1375020 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
Author: mduerig
Date: Mon Aug 20 13:52:07 2012
New Revision: 1375020
URL: http://svn.apache.org/viewvc?rev=1375020&view=rev
Log:
null check
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java?rev=1375020&r1=1375019&r2=1375020&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java Mon Aug 20 13:52:07 2012
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
+
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.jcr.PropertyType;
@@ -133,7 +134,8 @@ public class IdentifierManager {
// TODO as stated in NodeDelegate#getIdentifier() a non-uuid ID should
// TODO consisting of closest referenceable parent and a relative path
// TODO irrespective of the accessibility of the parent node(s)
- return root.getTree(identifier).getPath();
+ Tree tree = root.getTree(identifier);
+ return tree == null ? null : tree.getPath();
}
}