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 ju...@apache.org on 2014/06/16 18:11:28 UTC
svn commit: r1602917 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
Author: jukka
Date: Mon Jun 16 16:11:28 2014
New Revision: 1602917
URL: http://svn.apache.org/r1602917
Log:
1.0.1: Merged revision 1602914 (OAK-1804)
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1602914
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java?rev=1602917&r1=1602916&r2=1602917&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java Mon Jun 16 16:11:28 2014
@@ -206,7 +206,6 @@ public class SegmentNodeStore implements
if (commitSemaphore.tryAcquire()) {
try {
refreshHead();
- store.getTracker().getWriter().flush();
SegmentNodeState state = head.get();
SegmentNodeBuilder builder = state.builder();
@@ -227,7 +226,6 @@ public class SegmentNodeStore implements
cp.setChildNode(ROOT, state.getChildNode(ROOT));
SegmentNodeState newState = builder.getNodeState();
- store.getTracker().getWriter().flush();
if (store.setHead(state, newState)) {
refreshHead();
return name;
@@ -264,7 +262,6 @@ public class SegmentNodeStore implements
if (commitSemaphore.tryAcquire()) {
try {
refreshHead();
- store.getTracker().getWriter().flush();
SegmentNodeState state = head.get();
SegmentNodeBuilder builder = state.builder();
@@ -275,7 +272,6 @@ public class SegmentNodeStore implements
cp.remove();
}
SegmentNodeState newState = builder.getNodeState();
- store.getTracker().getWriter().flush();
if (store.setHead(state, newState)) {
refreshHead();
return;