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/06/01 14:19:13 UTC
svn commit: r1682882 - in
/lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene:
index/IndexWriter.java store/NativeFSLockFactory.java
Author: rmuir
Date: Mon Jun 1 12:19:12 2015
New Revision: 1682882
URL: http://svn.apache.org/r1682882
Log:
LUCENE-6508: don't make this code scary...
Modified:
lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java
Modified: lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1682882&r1=1682881&r2=1682882&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Mon Jun 1 12:19:12 2015
@@ -2304,7 +2304,7 @@ public class IndexWriter implements Clos
} finally {
if (success == false) {
// Release all previously acquired locks:
- // nocommit: addSuppressed
+ // TODO: addSuppressed? it could be many...
IOUtils.closeWhileHandlingException(locks);
}
}
Modified: lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java?rev=1682882&r1=1682881&r2=1682882&view=diff
==============================================================================
--- lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java (original)
+++ lucene/dev/branches/lucene6508/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java Mon Jun 1 12:19:12 2015
@@ -119,7 +119,7 @@ public final class NativeFSLockFactory e
}
} finally {
if (lock == null) { // not successful - clear up and move out
- IOUtils.close(channel); // nocommit: addSuppressed
+ IOUtils.closeWhileHandlingException(channel); // TODO: addSuppressed
clearLockHeld(realPath); // clear LOCK_HELD last
}
}