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 2014/12/17 09:41:11 UTC

svn commit: r1646174 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java

Author: mduerig
Date: Wed Dec 17 08:41:11 2014
New Revision: 1646174

URL: http://svn.apache.org/r1646174
Log:
OAK-2192 Concurrent commit during compaction results in mixed segments
Typo. Credits to Julian Sedding for spotting this.

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java?rev=1646174&r1=1646173&r2=1646174&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java Wed Dec 17 08:41:11 2014
@@ -72,7 +72,7 @@ public abstract class CompactionStrategy
 
     public static final CleanupType CLEANUP_DEFAULT = CleanupType.CLEAN_OLD;
 
-    public static final long TIMESTAMP_DEFAULT = 1000 * 60 * 60 + 10;  // 10h
+    public static final long TIMESTAMP_DEFAULT = 1000 * 60 * 60 * 10;  // 10h
 
     public static final byte MEMORY_THRESHOLD_DEFAULT = 5;