svn commit: r1428444 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java

[rm...@apache.org]

Author: rmuir
Date: Thu Jan  3 16:19:09 2013
New Revision: 1428444

URL: http://svn.apache.org/viewvc?rev=1428444&view=rev
Log:
try to make testThreadInterruptDeadlock reproducablish

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1428444&r1=1428443&r2=1428444&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Thu Jan  3 16:19:09 2013
@@ -1003,11 +1003,16 @@ public class TestIndexWriter extends Luc
     volatile boolean finish;
 
     volatile boolean allowInterrupt = false;
+    final Random random;
+    
+    IndexerThreadInterrupt() {
+      this.random = new Random(random().nextLong());
+    }
 
     @Override
     public void run() {
       // LUCENE-2239: won't work with NIOFS/MMAP
-      Directory dir = new MockDirectoryWrapper(random(), new RAMDirectory());
+      Directory dir = new MockDirectoryWrapper(random, new RAMDirectory());
       IndexWriter w = null;
       while(!finish) {
         try {
@@ -1017,14 +1022,14 @@ public class TestIndexWriter extends Luc
               w.close();
               w = null;
             }
-            IndexWriterConfig conf = newIndexWriterConfig(
-                                                          TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(2);
+            IndexWriterConfig conf = newIndexWriterConfig(random,
+                                                          TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMaxBufferedDocs(2);
             w = new IndexWriter(dir, conf);
 
             Document doc = new Document();
-            Field idField = newStringField("id", "", Field.Store.NO);
+            Field idField = newStringField(random, "id", "", Field.Store.NO);
             doc.add(idField);
-            doc.add(newField("field", "some text contents", storedTextType));
+            doc.add(newField(random, "field", "some text contents", storedTextType));
             for(int i=0;i<100;i++) {
               idField.setStringValue(Integer.toString(i));
               if (i%30 == 0) {