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:55:55 UTC

svn commit: r1670511 - in /lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene: index/ThreadedIndexingAndSearchingTestCase.java util/LineFileDocs.java

Author: mikemccand
Date: Tue Mar 31 22:55:54 2015
New Revision: 1670511

URL: http://svn.apache.org/r1670511
Log:
LUCENE-6271: fix LineFileDocs to not close itself; don't set daemon threads for ThreadedIndexingAndSearchingTestCase

Modified:
    lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
    lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.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=1670511&r1=1670510&r2=1670511&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:55:54 2015
@@ -309,7 +309,6 @@ public abstract class ThreadedIndexingAn
             doAfterIndexingThreadDone();
           }
         };
-      threads[thread].setDaemon(true);
       threads[thread].start();
     }
 
@@ -399,7 +398,6 @@ public abstract class ThreadedIndexingAn
             }
           }
         };
-      searchThreads[thread].setDaemon(true);
       searchThreads[thread].start();
     }
 

Modified: lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java?rev=1670511&r1=1670510&r2=1670511&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java (original)
+++ lucene/dev/branches/lucene6271/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java Tue Mar 31 22:55:54 2015
@@ -146,7 +146,8 @@ public class LineFileDocs implements Clo
   }
 
   public synchronized void reset(Random random) throws IOException {
-    close();
+    reader.close();
+    reader = null;
     open(random);
     id.set(0);
   }
@@ -215,7 +216,8 @@ public class LineFileDocs implements Clo
         if (LuceneTestCase.VERBOSE) {
           System.out.println("TEST: LineFileDocs: now rewind file...");
         }
-        close();
+        reader.close();
+        reader = null;
         open(null);
         line = reader.readLine();
       }