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/05/21 12:34:01 UTC
svn commit: r1596534 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java
test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java
Author: jukka
Date: Wed May 21 10:34:01 2014
New Revision: 1596534
URL: http://svn.apache.org/r1596534
Log:
OAK-1817: NPE in MarkSweepGarbageCollector.saveBatchToFile during Datastore GC with FileDataStore
Use correct segment size when wrapping the buffer
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java?rev=1596534&r1=1596533&r2=1596534&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentWriter.java Wed May 21 10:34:01 2014
@@ -219,7 +219,7 @@ public class SegmentWriter {
data.put(buffer, buffer.length - length, length);
data.rewind();
} else {
- data = ByteBuffer.wrap(buffer);
+ data = ByteBuffer.wrap(buffer, buffer.length - length, length);
}
tracker.setSegment(id, new Segment(tracker, id, data));
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java?rev=1596534&r1=1596533&r2=1596534&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java Wed May 21 10:34:01 2014
@@ -82,7 +82,6 @@ public class ExternalBlobTest {
is.close();
}
- @Ignore("OAK-1817")
@Test
public void testNullBlobId() throws Exception{
FileDataStore fds = createFileDataStore();