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:53:36 UTC

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

Author: mduerig
Date: Wed Dec 14 15:53:36 2016
New Revision: 1774278

URL: http://svn.apache.org/viewvc?rev=1774278&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/file/FileStoreBuilder.java

Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java?rev=1774278&r1=1774277&r2=1774278&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java Wed Dec 14 15:53:36 2016
@@ -98,12 +98,16 @@ public class FileStoreBuilder {
         @Override
         public void compactionSucceeded(int newGeneration) {
             compacted();
-            cacheManager.evictOldGeneration(newGeneration);
+            if (cacheManager != null) {
+                cacheManager.evictOldGeneration(newGeneration);
+            }
         }
 
         @Override
         public void compactionFailed(int failedGeneration) {
-            cacheManager.evictGeneration(failedGeneration);
+            if (cacheManager != null) {
+                cacheManager.evictGeneration(failedGeneration);
+            }
         }
     };