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 2012/01/21 17:18:12 UTC
svn commit: r1234357 - in
/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs:
lucene40/Lucene40LiveDocsFormat.java simpletext/SimpleTextLiveDocsFormat.java
Author: rmuir
Date: Sat Jan 21 16:18:11 2012
New Revision: 1234357
URL: http://svn.apache.org/viewvc?rev=1234357&view=rev
Log:
LUCENE-3661: remove duplciate delete-file-handling
Modified:
lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40LiveDocsFormat.java
lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java
Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40LiveDocsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40LiveDocsFormat.java?rev=1234357&r1=1234356&r2=1234357&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40LiveDocsFormat.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/lucene40/Lucene40LiveDocsFormat.java Sat Jan 21 16:18:11 2012
@@ -9,7 +9,6 @@ import org.apache.lucene.index.SegmentIn
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.MutableBits;
public class Lucene40LiveDocsFormat extends LiveDocsFormat {
@@ -34,17 +33,7 @@ public class Lucene40LiveDocsFormat exte
public void writeLiveDocs(MutableBits bits, Directory dir, SegmentInfo info, IOContext context) throws IOException {
// nocommit: this api is ugly...
String filename = IndexFileNames.fileNameFromGeneration(info.name, DELETES_EXTENSION, info.getDelGen());
-
- // nocommit: test if we really need this
- boolean success = false;
- try {
- ((BitVector)bits).write(dir, filename, context);
- success = true;
- } finally {
- if (!success) {
- IOUtils.deleteFilesIgnoringExceptions(dir, filename);
- }
- }
+ ((BitVector)bits).write(dir, filename, context);
}
@Override
Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java?rev=1234357&r1=1234356&r2=1234357&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java Sat Jan 21 16:18:11 2012
@@ -127,7 +127,6 @@ public class SimpleTextLiveDocsFormat ex
IOUtils.close(out);
} else {
IOUtils.closeWhileHandlingException(out);
- IOUtils.deleteFilesIgnoringExceptions(dir, fileName);
}
}
}