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 2015/04/01 00:44:11 UTC
svn commit: r1670508 -
/lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
Author: mikemccand
Date: Tue Mar 31 22:44:11 2015
New Revision: 1670508
URL: http://svn.apache.org/r1670508
Log:
LUCENE-6271: fix test to fail faster
Modified:
lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
Modified: lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1670508&r1=1670507&r2=1670508&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Tue Mar 31 22:44:11 2015
@@ -332,7 +332,7 @@ public abstract class ThreadedIndexingAn
if (VERBOSE) {
System.out.println(Thread.currentThread().getName() + ": launch search thread");
}
- while (System.currentTimeMillis() < stopTimeMS) {
+ while (System.currentTimeMillis() < stopTimeMS && !failed.get()) {
try {
final IndexSearcher s = getCurrentSearcher();
try {
@@ -403,8 +403,8 @@ public abstract class ThreadedIndexingAn
searchThreads[thread].start();
}
- for(int thread=0;thread<searchThreads.length;thread++) {
- searchThreads[thread].join();
+ for(Thread thread : searchThreads) {
+ thread.join();
}
if (VERBOSE) {
@@ -535,8 +535,8 @@ public abstract class ThreadedIndexingAn
System.out.println("TEST: all searching done [" + (System.currentTimeMillis()-t0) + " ms]");
}
- for(int thread=0;thread<indexThreads.length;thread++) {
- indexThreads[thread].join();
+ for(Thread thread : indexThreads) {
+ thread.join();
}
if (VERBOSE) {