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 2011/05/10 20:02:07 UTC
svn commit: r1101572 -
/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
Author: mikemccand
Date: Tue May 10 18:02:06 2011
New Revision: 1101572
URL: http://svn.apache.org/viewvc?rev=1101572&view=rev
Log:
fix false test failure
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=1101572&r1=1101571&r2=1101572&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 Tue May 10 18:02:06 2011
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
*/
import java.io.ByteArrayOutputStream;
-import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
import java.io.Reader;
@@ -1130,10 +1129,12 @@ public class TestIndexWriter extends Luc
while(true) {
MergePolicy.OneMerge merge = writer.getNextMerge();
- if (merge == null)
+ if (merge == null) {
break;
- for(int i=0;i<merge.segments.size();i++)
- assert merge.segments.info(i).docCount < 20;
+ }
+ for(int i=0;i<merge.segments.size();i++) {
+ assert merge.segments.get(i).docCount < 20;
+ }
writer.merge(merge);
}
}
@@ -2141,6 +2142,7 @@ public class TestIndexWriter extends Luc
while(true) {
if (w != null) {
w.close();
+ w = null;
}
IndexWriterConfig conf = newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMaxBufferedDocs(2);
@@ -2186,10 +2188,12 @@ public class TestIndexWriter extends Luc
if (!failed) {
// clear interrupt state:
Thread.interrupted();
- try {
- w.rollback();
- } catch (IOException ioe) {
- throw new RuntimeException(ioe);
+ if (w != null) {
+ try {
+ w.rollback();
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ }
}
try {