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

[jukka]

Author: jukka
Date: Mon Mar 17 14:10:12 2014
New Revision: 1578386

URL: http://svn.apache.org/r1578386
Log:
OAK-1545: NPE in SegmentTracker

Use Segment.id instead of Segment.refids in getSegmentId() got prevent the NPE

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Segment.java
    
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/Segment.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Segment.java?rev=1578386&r1=1578385&r2=1578386&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Segment.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Segment.java
 Mon Mar 17 14:10:12 2014
@@ -159,7 +159,7 @@ public class Segment {
     }
 
     public SegmentId getSegmentId() {
-        return refids[0];
+        return id;
     }
 
     int getRefCount() {

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=1578386&r1=1578385&r2=1578386&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 14:10:12 2014
@@ -95,11 +95,6 @@ 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();