jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1575342 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/memory/MemoryStore.java
Date Fri, 07 Mar 2014 17:54:48 GMT
Author: jukka
Date: Fri Mar  7 17:54:47 2014
New Revision: 1575342

URL: http://svn.apache.org/r1575342
Log:
OAK-593: Segment-based MK

Remember to check the segment that's currently being written

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

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/memory/MemoryStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/memory/MemoryStore.java?rev=1575342&r1=1575341&r2=1575342&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/memory/MemoryStore.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/memory/MemoryStore.java
Fri Mar  7 17:54:47 2014
@@ -81,7 +81,10 @@ public class MemoryStore implements Segm
 
     @Override @Nonnull
     public Segment readSegment(UUID uuid) {
-        Segment segment = segments.get(uuid);
+        Segment segment = writer.getCurrentSegment(uuid);
+        if (segment == null) {
+            segment = segments.get(uuid);
+        }
         if (segment != null) {
             return segment;
         } else {



Mime
View raw message