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 al...@apache.org on 2017/03/01 14:28:18 UTC
svn commit: r1784953 -
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java
Author: alexparvulescu
Date: Wed Mar 1 14:28:18 2017
New Revision: 1784953
URL: http://svn.apache.org/viewvc?rev=1784953&view=rev
Log:
OAK-5863 SegmentNodeBuilder getNodeState can trigger eager flush of child node builder
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java?rev=1784953&r1=1784952&r2=1784953&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeBuilder.java Wed Mar 1 14:28:18 2017
@@ -111,7 +111,9 @@ public class SegmentNodeBuilder extends
SegmentNodeState sState = writer.writeNode(state);
if (state != sState) {
set(sState);
- updateCount = 0;
+ if(!isChildBuilder()) {
+ updateCount = 0;
+ }
}
return sState;
} catch (IOException e) {