Author: mduerig
Date: Fri Apr 22 22:35:16 2016
New Revision: 1740612
URL: http://svn.apache.org/viewvc?rev=1740612&view=rev
Log:
OAK-3348: Cross gc sessions might introduce references to pre-compacted segments
Make fields final
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentVersion.java
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentVersion.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentVersion.java?rev=1740612&r1=1740611&r2=1740612&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentVersion.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentVersion.java
Fri Apr 22 22:35:16 2016
@@ -53,7 +53,7 @@ public enum SegmentVersion {
/**
* Latest segment version
*/
- public static SegmentVersion LATEST_VERSION =
max(allOf(SegmentVersion.class),
+ public static final SegmentVersion LATEST_VERSION =
max(allOf(SegmentVersion.class),
new Comparator<SegmentVersion>() {
@Override
public int compare(SegmentVersion v1, SegmentVersion v2) {
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1740612&r1=1740611&r2=1740612&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Fri Apr 22 22:35:16 2016
@@ -33,7 +33,6 @@ import static java.util.Collections.empt
import static java.util.Collections.singletonMap;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
-import static org.apache.jackrabbit.oak.api.CommitFailedException.OAK;
import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.segment.SegmentId.isDataSegmentId;
@@ -1149,7 +1148,7 @@ public class FileStore implements Segmen
// FIXME OAK-4015: Expedite commits from the compactor
// use a lock that can expedite important commits like compaction and
checkpoints.
- private ReadWriteLock rwLock = new ReentrantReadWriteLock();
+ private final ReadWriteLock rwLock = new ReentrantReadWriteLock();
@Override
public boolean setHead(SegmentNodeState base, SegmentNodeState head) {
