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 re...@apache.org on 2014/11/13 20:22:13 UTC
svn commit: r1639475 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Author: reschke
Date: Thu Nov 13 19:22:13 2014
New Revision: 1639475
URL: http://svn.apache.org/r1639475
Log:
OAK-1830 - DocumentNodeStore code robustness when persistence inconsistent (ported to 1.0)
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1595147
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1639475&r1=1639474&r2=1639475&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Thu Nov 13 19:22:13 2014
@@ -898,7 +898,12 @@ public final class DocumentNodeStore
@Override
public DocumentNodeState apply(String input) {
String p = PathUtils.concat(parent.getPath(), input);
- return getNode(p, readRevision);
+ DocumentNodeState result = getNode(p, readRevision);
+ if (result == null) {
+ throw new MicroKernelException("DocumentNodeState is null for revision " + readRevision + " of " + p
+ + " (aborting getChildNodes())");
+ }
+ return result;
}
});
}