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/28 20:22:22 UTC

svn commit: r1128726 - in /lucene/dev/branches/leaky3147/lucene/src: java/org/apache/lucene/index/TermVectorsTermsWriter.java test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java

Author: mikemccand
Date: Sat May 28 18:22:22 2011
New Revision: 1128726

URL: http://svn.apache.org/viewvc?rev=1128726&view=rev
Log:
LUCENE-3147: fix another fail

Modified:
    lucene/dev/branches/leaky3147/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java
    lucene/dev/branches/leaky3147/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java

Modified: lucene/dev/branches/leaky3147/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/leaky3147/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java?rev=1128726&r1=1128725&r2=1128726&view=diff
==============================================================================
--- lucene/dev/branches/leaky3147/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java (original)
+++ lucene/dev/branches/leaky3147/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java Sat May 28 18:22:22 2011
@@ -160,6 +160,7 @@ final class TermVectorsTermsWriter exten
       IOUtils.closeSafely(true, tvx, tvd, tvf);
     } catch (IOException e) {
       // cannot happen since we suppress exceptions
+      throw new RuntimeException(e);
     }
     
     try {

Modified: lucene/dev/branches/leaky3147/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/leaky3147/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java?rev=1128726&r1=1128725&r2=1128726&view=diff
==============================================================================
--- lucene/dev/branches/leaky3147/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java (original)
+++ lucene/dev/branches/leaky3147/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java Sat May 28 18:22:22 2011
@@ -102,12 +102,30 @@ final class TermInfosWriter implements C
     fieldInfos = fis;
     isIndex = isi;
     output = directory.createOutput(segment + (isIndex ? ".tii" : ".tis"));
+    boolean success = false;
+    try {
     output.writeInt(FORMAT_CURRENT);              // write format
     output.writeLong(0);                          // leave space for size
     output.writeInt(indexInterval);               // write indexInterval
     output.writeInt(skipInterval);                // write skipInterval
     output.writeInt(maxSkipLevels);               // write maxSkipLevels
     assert initUTF16Results();
+      success = true;
+    } finally {
+      if (!success) {
+        try {
+          IOUtils.closeSafely(true, output);
+        } catch (IOException e) {
+          // cannot happen since we suppress exceptions
+          throw new RuntimeException(e);
+        }
+
+        try {
+          directory.deleteFile(segment + (isIndex ? ".tii" : ".tis"));
+        } catch (IOException ignored) {
+        }
+      }
+    }
   }
 
   // Currently used only by assert statements