Author: frm
Date: Mon Nov 27 15:55:06 2017
New Revision: 1816468
URL: http://svn.apache.org/viewvc?rev=1816468&view=rev
Log:
OAK-6988 - The checkpoints command should not silently upgrade the FileStore
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/SegmentTarCheckpoints.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/SegmentTarCheckpoints.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/SegmentTarCheckpoints.java?rev=1816468&r1=1816467&r2=1816468&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/SegmentTarCheckpoints.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/checkpoint/SegmentTarCheckpoints.java
Mon Nov 27 15:55:06 2017
@@ -39,9 +39,13 @@ import org.apache.jackrabbit.oak.spi.sta
class SegmentTarCheckpoints extends Checkpoints {
+ private static FileStore newFileStore(File path) throws IOException,
InvalidFileStoreVersionException {
+ return fileStoreBuilder(path).withStrictVersionCheck(true).build();
+ }
+
static Checkpoints create(File path, Closer closer) throws IOException {
try {
- return new
SegmentTarCheckpoints(closer.register(fileStoreBuilder(path).build()));
+ return new
SegmentTarCheckpoints(closer.register(newFileStore(path)));
} catch (InvalidFileStoreVersionException e) {
throw new IllegalStateException(e);
}