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 2014/04/30 18:13:40 UTC
svn commit: r1591382 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java
Author: mduerig
Date: Wed Apr 30 16:13:40 2014
New Revision: 1591382
URL: http://svn.apache.org/r1591382
Log:
OAK-1781: Too many branch commits on document node store
merge revision 1591362
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1591362
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java?rev=1591382&r1=1591381&r2=1591382&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java Wed Apr 30 16:13:40 2014
@@ -104,8 +104,12 @@ class DocumentRootBuilder extends Memory
@Nonnull
@Override
public NodeState getNodeState() {
- purge();
- return branch.getHead();
+ if (DocumentNodeStoreBranch.getCurrentBranch() != null) {
+ purge();
+ return branch.getHead();
+ } else {
+ return super.getNodeState();
+ }
}
@Override