svn commit: r1774273 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyDiff.java

[mduerig]

Author: mduerig
Date: Wed Dec 14 15:40:40 2016
New Revision: 1774273

URL: http://svn.apache.org/viewvc?rev=1774273&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/standby/client/StandbyDiff.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyDiff.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyDiff.java?rev=1774273&r1=1774272&r2=1774273&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyDiff.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyDiff.java
 Wed Dec 14 15:40:40 2016
@@ -34,6 +34,7 @@ import org.apache.jackrabbit.oak.segment
 import org.apache.jackrabbit.oak.segment.SegmentBlob;
 import org.apache.jackrabbit.oak.segment.SegmentNodeState;
 import org.apache.jackrabbit.oak.segment.file.FileStore;
+import org.apache.jackrabbit.oak.spi.blob.BlobStore;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
@@ -170,7 +171,9 @@ class StandbyDiff implements NodeStateDi
         }
 
         try {
-            store.getBlobStore().writeBlob(new ByteArrayInputStream(data));
+            BlobStore blobStore = store.getBlobStore();
+            assert blobStore != null : "Blob store must not be null";
+            blobStore.writeBlob(new ByteArrayInputStream(data));
         } catch (IOException f) {
             throw new IllegalStateException("Unable to persist blob " + blobId 
+ " at " + path + "#" + pName, f);
         }