You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2015/05/29 20:03:37 UTC
svn commit: r1682526 - in /lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store: LockStressTest.java SimpleFSLockFactory.java

Author: uschindler
Date: Fri May 29 18:03:36 2015
New Revision: 1682526

URL: http://svn.apache.org/r1682526
Log:
LUCENE-6508: Make the lock stress tester use new Exception; add Windows-specific Exception to SimpleFSLockFactory

Modified:
    lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java
    lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java

Modified: lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java?rev=1682526&r1=1682525&r2=1682526&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java (original)
+++ lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java Fri May 29 18:03:36 2015
@@ -108,12 +108,12 @@ public class LockStressTest {
             }
             try (final Lock secondLock = verifyLF.obtainLock(lockDir, LOCK_FILE_NAME)) {
               throw new IOException("Double obtain");
-            } catch (IOException ioe) {
+            } catch (LockObtainFailedException loe) {
               // pass
             }
           }
           Thread.sleep(sleepTimeMS);
-        } catch (IOException ioe) {
+        } catch (LockObtainFailedException loe) {
           // obtain failed
         }
 

Modified: lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java?rev=1682526&r1=1682525&r2=1682526&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java (original)
+++ lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java Fri May 29 18:03:36 2015
@@ -19,6 +19,7 @@ package org.apache.lucene.store;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.AccessDeniedException;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -85,7 +86,7 @@ public final class SimpleFSLockFactory e
     // create the file: this will fail if it already exists
     try {
       Files.createFile(lockFile);
-    } catch (FileAlreadyExistsException e) {
+    } catch (FileAlreadyExistsException | AccessDeniedException e) {
       // convert optional specific exception to our optional specific exception
       throw new LockObtainFailedException("Lock held elsewhere: " + lockFile, e);
     }