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 2016/12/14 15:43:50 UTC

svn commit: r1774275 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java

Author: mduerig
Date: Wed Dec 14 15:43:49 2016
New Revision: 1774275

URL: http://svn.apache.org/viewvc?rev=1774275&view=rev
Log:
OAK-5293: Static code analysis and code cleanup
Fix possible null dereference

Modified:
    jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java?rev=1774275&r1=1774274&r2=1774275&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java Wed Dec 14 15:43:49 2016
@@ -169,6 +169,7 @@ public class SegmentStream extends Input
                     id = ids.get(i);
                 }
 
+                assert id == null || first != null;
                 if (id != null
                         && id.getSegmentId().equals(first.getSegmentId())
                         && id.getRecordNumber() == first.getRecordNumber() + count * BLOCK_SIZE) {