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 md...@apache.org on 2015/12/15 15:12:53 UTC
svn commit: r1720171 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
Author: mduerig
Date: Tue Dec 15 14:12:52 2015
New Revision: 1720171
URL: http://svn.apache.org/viewvc?rev=1720171&view=rev
Log:
OAK-3795: FileStore#compact should throw ISE instead of IAE when no compaction strategy is set
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1720171&r1=1720170&r2=1720171&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java Tue Dec 15 14:12:52 2015
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.segment.file;
-import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.collect.Lists.newArrayList;
@@ -965,7 +964,7 @@ public class FileStore implements Segmen
* reference to them).
*/
public void compact() throws IOException {
- checkArgument(!compactionStrategy.equals(NO_COMPACTION),
+ checkState(!compactionStrategy.equals(NO_COMPACTION),
"You must set a compactionStrategy before calling compact");
gcMonitor.info("TarMK GC #{}: compaction started, strategy={}", gcCount, compactionStrategy);
Stopwatch watch = Stopwatch.createStarted();