You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/05/29 19:53:41 UTC
svn commit: r1682525 - in /lucene/dev/branches/lucene6508/lucene/core/src:
java/org/apache/lucene/store/LockFactory.java
java/org/apache/lucene/store/SingleInstanceLockFactory.java
test/org/apache/lucene/index/TestIndexWriterWithThreads.java
Author: rmuir
Date: Fri May 29 17:53:41 2015
New Revision: 1682525
URL: http://svn.apache.org/r1682525
Log:
LUCENE-6508: add back LockObtainFailedException for SingleInstance too
Modified:
lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/LockFactory.java
lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java
lucene/dev/branches/lucene6508/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
Modified: lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/LockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/LockFactory.java?rev=1682525&r1=1682524&r2=1682525&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/LockFactory.java (original)
+++ lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/LockFactory.java Fri May 29 17:53:41 2015
@@ -50,7 +50,9 @@ public abstract class LockFactory {
/**
* Return a new obtained Lock instance identified by lockName.
* @param lockName name of the lock to be created.
- * @throws IOException if the lock could not be obtained
+ * @throws LockObtainFailedException (optional specific exception) if the lock could
+ * not be obtained because it is currently held elsewhere.
+ * @throws IOException if any i/o error occurs attempting to gain the lock
*/
public abstract Lock obtainLock(Directory dir, String lockName) throws IOException;
Modified: lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java?rev=1682525&r1=1682524&r2=1682525&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java (original)
+++ lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java Fri May 29 17:53:41 2015
@@ -41,7 +41,7 @@ public final class SingleInstanceLockFac
if (locks.add(lockName)) {
return new SingleInstanceLock(lockName);
} else {
- throw new IOException("lock instance already obtained: (dir=" + dir + ", lockName=" + lockName + ")");
+ throw new LockObtainFailedException("lock instance already obtained: (dir=" + dir + ", lockName=" + lockName + ")");
}
}
}
Modified: lucene/dev/branches/lucene6508/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java?rev=1682525&r1=1682524&r2=1682525&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java (original)
+++ lucene/dev/branches/lucene6508/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java Fri May 29 17:53:41 2015
@@ -34,6 +34,7 @@ import org.apache.lucene.search.DocIdSet
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.BaseDirectoryWrapper;
import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;