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

[mduerig]

Author: mduerig
Date: Tue Aug  4 10:42:05 2015
New Revision: 1694022

URL: http://svn.apache.org/r1694022
Log:
OAK-3168: SegmentCache flushes Segment on update
Only actually evict the item from the cache when the eviction callback is fired 
for the value (and not for the key)

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=1694022&r1=1694021&r2=1694022&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
 Tue Aug  4 10:42:05 2015
@@ -130,7 +130,9 @@ public class SegmentTracker {
             .evictionCallback(new EvictionCallback<SegmentId, Segment>() {
                 @Override
                 public void evicted(SegmentId segmentId, Segment segment) {
-                    segmentId.setSegment(null);
+                    if (segment != null) {
+                        segmentId.setSegment(null);
+                    }
                 }
             })
             .build();