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 2011/11/11 04:51:41 UTC
svn commit: r1200727 -
/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/TermVectorsConsumer.java
Author: rmuir
Date: Fri Nov 11 03:51:40 2011
New Revision: 1200727
URL: http://svn.apache.org/viewvc?rev=1200727&view=rev
Log:
LUCENE-2621: close TV writer in a finally block, fill() does i/o...
Modified:
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/TermVectorsConsumer.java
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/TermVectorsConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/TermVectorsConsumer.java?rev=1200727&r1=1200726&r2=1200727&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/TermVectorsConsumer.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/TermVectorsConsumer.java Fri Nov 11 03:51:40 2011
@@ -51,15 +51,17 @@ final class TermVectorsConsumer extends
void flush(Map<FieldInfo, TermsHashConsumerPerField> fieldsToFlush, final SegmentWriteState state) throws IOException {
if (writer != null) {
// At least one doc in this run had term vectors enabled
- fill(state.numDocs);
- assert state.segmentName != null;
- writer.finish(state.numDocs);
- // nocommit: I think we should try-finally?
- IOUtils.close(writer);
- writer = null;
-
- lastDocID = 0;
- hasVectors = false;
+ try {
+ fill(state.numDocs);
+ assert state.segmentName != null;
+ writer.finish(state.numDocs);
+ } finally {
+ IOUtils.close(writer);
+ writer = null;
+
+ lastDocID = 0;
+ hasVectors = false;
+ }
}
for (final TermsHashConsumerPerField field : fieldsToFlush.values() ) {