Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java (date 1398424811000) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java (date 1398775229000) @@ -104,8 +104,12 @@ @Nonnull @Override public NodeState getNodeState() { + if (DocumentNodeStoreBranch.getCurrentBranch() != null) { - purge(); - return branch.getHead(); + purge(); + return branch.getHead(); + } else { + return super.getNodeState(); + } } @Override