You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2010/07/29 14:56:53 UTC
svn commit: r980428 -
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
Author: mikemccand
Date: Thu Jul 29 12:56:52 2010
New Revision: 980428
URL: http://svn.apache.org/viewvc?rev=980428&view=rev
Log:
fix (again) TestIW.testThreadInterruptDeadlock to properly close (abort) its writer
Modified:
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=980428&r1=980427&r2=980428&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java Thu Jul 29 12:56:52 2010
@@ -4387,13 +4387,15 @@ public class TestIndexWriter extends Luc
}
}
- try {
- w.rollback();
- } catch (IOException ioe) {
- throw new RuntimeException(ioe);
- }
-
if (!failed) {
+ // clear interrupt state:
+ Thread.interrupted();
+ try {
+ w.rollback();
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ }
+
try {
_TestUtil.checkIndex(dir);
} catch (Exception e) {
@@ -4618,9 +4620,9 @@ public class TestIndexWriter extends Luc
for(int i=0;i<NUM_THREADS;i++) {
threads[i].join();
}
+ assertFalse(failed.get());
w.close();
dir.close();
- assertFalse(failed.get());
}
// both start & end are inclusive