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 ju...@apache.org on 2014/04/24 22:16:04 UTC
svn commit: r1589867 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
Author: jukka
Date: Thu Apr 24 20:16:04 2014
New Revision: 1589867
URL: http://svn.apache.org/r1589867
Log:
1.0: Merged revision 1589864 (OAK-1758)
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1589864
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java?rev=1589867&r1=1589866&r2=1589867&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java Thu Apr 24 20:16:04 2014
@@ -124,12 +124,12 @@ public class SegmentTracker {
while (currentSize > cacheSize && segments.size() > 1) {
Segment last = segments.removeLast();
+ SegmentId lastId = last.getSegmentId();
if (last.accessed()) {
segments.addFirst(last);
log.debug("Segment {} was recently used, keeping in cache",
- segment.getSegmentId());
+ lastId);
} else {
- SegmentId lastId = last.getSegmentId();
long lastSize = last.getCacheSize();
lastId.setSegment(null);