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/06/10 22:54:31 UTC
svn commit: r1601769 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Record.java
Author: jukka
Date: Tue Jun 10 20:54:31 2014
New Revision: 1601769
URL: http://svn.apache.org/r1601769
Log:
1.0.1: Merged revision 1601768 (OAK-1804)
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Record.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1601768
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Record.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Record.java?rev=1601769&r1=1601768&r2=1601769&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Record.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Record.java Tue Jun 10 20:54:31 2014
@@ -36,7 +36,7 @@ class Record {
return true;
}
- CompactionMap compaction = a.getStore().getTracker().getCompactionMap();
+ CompactionMap compaction = a.segmentId.getTracker().getCompactionMap();
RecordId aid = a.getRecordId();
RecordId bid = b.getRecordId();
return compaction.wasCompactedTo(aid, bid)
@@ -77,15 +77,6 @@ class Record {
}
/**
- * Returns the segment store.
- *
- * @return segment store
- */
- public SegmentStore getStore() {
- return segmentId.getTracker().getStore();
- }
-
- /**
* Returns the identifier of this record.
*
* @return record identifier