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/03/01 15:19:53 UTC
svn commit: r1784968 - in
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment:
Segment.java file/FileStore.java
Author: mduerig
Date: Wed Mar 1 15:19:53 2017
New Revision: 1784968
URL: http://svn.apache.org/viewvc?rev=1784968&view=rev
Log:
@trivial: make helper method static, add missing @NonNull
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
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/Segment.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java?rev=1784968&r1=1784967&r2=1784968&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java Wed Mar 1 15:19:53 2017
@@ -280,6 +280,7 @@ public class Segment {
return id;
}
+ @Nonnull
@Override
public Iterator<SegmentId> iterator() {
return new AbstractIterator<SegmentId>() {
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=1784968&r1=1784967&r2=1784968&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 Wed Mar 1 15:19:53 2017
@@ -569,7 +569,7 @@ public class FileStore extends AbstractF
}
}
- private SegmentNotFoundException asSegmentNotFoundException(ExecutionException e, SegmentId id) {
+ private static SegmentNotFoundException asSegmentNotFoundException(ExecutionException e, SegmentId id) {
if (e.getCause() instanceof SegmentNotFoundException) {
return (SegmentNotFoundException) e.getCause();
}