You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/04/29 20:07:21 UTC

svn commit: r1591038 - in /lucene/dev/trunk/lucene/core/src: java/org/apache/lucene/index/DefaultIndexingChain.java test/org/apache/lucene/index/TestIndexWriterWithThreads.java

Author: rmuir
Date: Tue Apr 29 18:07:20 2014
New Revision: 1591038

URL: http://svn.apache.org/r1591038
Log:
fix test to actually throw exception

Modified:
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java
    lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java?rev=1591038&r1=1591037&r2=1591038&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java Tue Apr 29 18:07:20 2014
@@ -317,14 +317,13 @@ final class DefaultIndexingChain extends
           indexDocValue(fp, dvType, field);
         }
       }
+      storedFieldsWriter.finishDocument();
       success = true;
     } finally {
       if (success == false) {
         // We must abort, on the possibility that the
         // stored fields file is now corrupt:
         docWriter.setAborting();
-      } else {
-        storedFieldsWriter.finishDocument();
       }
     }
   }

Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java?rev=1591038&r1=1591037&r2=1591038&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java Tue Apr 29 18:07:20 2014
@@ -427,7 +427,7 @@ public class TestIndexWriterWithThreads 
       if (doFail) {
         StackTraceElement[] trace = new Exception().getStackTrace();
         for (int i = 0; i < trace.length; i++) {
-          if ("flush".equals(trace[i].getMethodName()) && "org.apache.lucene.index.DocFieldProcessor".equals(trace[i].getClassName())) {
+          if ("flush".equals(trace[i].getMethodName()) && DefaultIndexingChain.class.getName().equals(trace[i].getClassName())) {
             if (onlyOnce)
               doFail = false;
             //System.out.println(Thread.currentThread().getName() + ": NOW FAIL: onlyOnce=" + onlyOnce);