svn commit: r1578271 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java

[alexparvulescu]

Author: alexparvulescu
Date: Mon Mar 17 09:09:24 2014
New Revision: 1578271

URL: http://svn.apache.org/r1578271
Log:
OAK-1545 NPE in SegmentTracker
 - temp fix

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

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java?rev=1578271&r1=1578270&r2=1578271&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
 Mon Mar 17 09:09:24 2014
@@ -95,6 +95,11 @@ public class SegmentTracker {
         Segment segment = store.readSegment(id);
         id.setSegment(segment);
 
+        if (id.isBulkSegmentId()) {
+            // don't cache bulk segments
+            return segment;
+        }
+
         synchronized (this) {
             segments.addFirst(segment);
             currentSize += segment.getCacheSize();