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 2013/03/05 13:50:10 UTC

svn commit: r1452775 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java

Author: jukka
Date: Tue Mar  5 12:50:09 2013
New Revision: 1452775

URL: http://svn.apache.org/r1452775
Log:
OAK-633: SegmentMK: Hierarchy of journals

Make the SNSS proxy mechanism work properly with the new Journal interface

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java?rev=1452775&r1=1452774&r2=1452775&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java Tue Mar  5 12:50:09 2013
@@ -61,8 +61,17 @@ public class SegmentNodeStoreService ext
     public SegmentNodeStoreService(final SegmentStore[] store) {
         super(new SegmentStore() {
             @Override
-            public Journal getJournal(String name) {
-                return store[0].getJournal(name);
+            public Journal getJournal(final String name) {
+                return new Journal() {
+                    @Override
+                    public RecordId getHead() {
+                        return store[0].getJournal(name).getHead();
+                    }
+                    @Override
+                    public boolean setHead(RecordId base, RecordId head) {
+                        return store[0].getJournal(name).setHead(base, head);
+                    }
+                };
             }
             @Override
             public Segment readSegment(UUID segmentId) {