Author: jukka
Date: Thu Aug 15 07:53:43 2013
New Revision: 1514190
URL: http://svn.apache.org/r1514190
Log:
OAK-659: Move purge logic for transient changes below the NodeBuilder interface
Implement SegmentNodeStore.reset()
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java?rev=1514190&r1=1514189&r2=1514190&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
Thu Aug 15 07:53:43 2013
@@ -90,7 +90,9 @@ public class SegmentNodeStore extends Ab
@Override
public NodeState reset(@Nonnull NodeBuilder builder) {
- return super.reset(builder); // TODO implement reset
+ NodeState state = getRoot();
+ checkNotNull(builder).reset(state);
+ return state;
}
@Override @Nonnull