svn commit: r1576452 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java

[jukka]

Author: jukka
Date: Tue Mar 11 18:22:15 2014
New Revision: 1576452

URL: http://svn.apache.org/r1576452
Log:
OAK-1524: NPE in TarMK flush thread

Fixed as suggested by Chetan Mehrotra

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1576452&r1=1576451&r2=1576452&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
 Tue Mar 11 18:22:15 2014
@@ -234,8 +234,10 @@ public class FileStore implements Segmen
             }
         }
 
-        for (Segment segment : segments.asMap().values().toArray(new 
Segment[0])) {
-            segment.dropOldCacheEntries();
+        if (segments != null) {
+            for (Segment segment : segments.asMap().values().toArray(new 
Segment[0])) {
+                segment.dropOldCacheEntries();
+            }
         }
     }