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 md...@apache.org on 2017/12/15 12:00:33 UTC

svn commit: r1818272 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java

Author: mduerig
Date: Fri Dec 15 12:00:33 2017
New Revision: 1818272

URL: http://svn.apache.org/viewvc?rev=1818272&view=rev
Log:
OAK-6984: High read IO in compaction retry cycles
Fix nullability

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=1818272&r1=1818271&r2=1818272&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 Fri Dec 15 12:00:33 2017
@@ -835,8 +835,8 @@ public class FileStore extends AbstractF
         }
 
         private SegmentNodeState forceCompact(
-                @Nullable final NodeState base,
-                @Nullable final NodeState onto,
+                @Nonnull final NodeState base,
+                @Nonnull final NodeState onto,
                 @Nonnull final CheckpointCompactor compactor)
         throws InterruptedException {
             RecordId compactedId = revisions.setHead(new Function<RecordId, RecordId>() {