Author: mreutegg
Date: Tue Jul 15 06:22:33 2014
New Revision: 1610593
URL: http://svn.apache.org/r1610593
Log:
OAK-1968: Wrong time unit for async index lease time
Merged revision 1610592 from trunk
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1610592
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java?rev=1610593&r1=1610592&r2=1610593&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
Tue Jul 15 06:22:33 2014
@@ -70,11 +70,11 @@ public class AsyncIndexUpdate implements
"Async", 1, "Concurrent update detected");
/**
- * Timeout in minutes after which an async job would be considered as
+ * Timeout in milliseconds after which an async job would be considered as
* timed out. Another node in cluster would wait for timeout before
* taking over a running job
*/
- private static final int ASYNC_TIMEOUT = 15;
+ private static final long ASYNC_TIMEOUT = TimeUnit.MINUTES.toMillis(15);
private final String name;
