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 fr...@apache.org on 2017/06/22 17:41:26 UTC
svn commit: r1799600 -
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Author: frm
Date: Thu Jun 22 17:41:26 2017
New Revision: 1799600
URL: http://svn.apache.org/viewvc?rev=1799600&view=rev
Log:
OAK-6386 - Check for null when calling SegmentWriter#writeNode()
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1799600&r1=1799599&r2=1799600&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Thu Jun 22 17:41:26 2017
@@ -769,7 +769,11 @@ public class FileStore extends AbstractF
return new Compactor(segmentReader, writer, getBlobStore(), cancel, gcOptions)
.compact(EMPTY_NODE, head, EMPTY_NODE);
} else {
- return new SegmentNodeState(segmentReader, writer, getBlobStore(), writer.writeNode(head, cancel));
+ RecordId id = writer.writeNode(head, cancel);
+ if (id == null) {
+ return null;
+ }
+ return new SegmentNodeState(segmentReader, writer, getBlobStore(), id);
}
}