Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-03-04 15:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

LUCENE-3598: fix some accidental behaviour changes here...

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1209663 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2011-12-02 19:52:39 +00:00
parent 8c8043acc0
commit 6179cbb4bd
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lucene/src/java/org/apache/lucene/index/IndexWriter.java
View File

@ -371,7 +371,9 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
// never reached but javac disagrees:
return null;
} finally {
infoStream.message("IW", "hit exception during NRT reader");
if (!success && infoStream.isEnabled("IW")) {
infoStream.message("IW", "hit exception during NRT reader");
}
// Done: finish the full flush!
docWriter.finishFullFlush(success);
doAfterFlush();
@ -1335,7 +1337,9 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
anySegmentFlushed = docWriter.updateDocuments(docs, analyzer, delTerm);
success = true;
} finally {
infoStream.message("IW", "hit exception updating document");
if (!success && infoStream.isEnabled("IW")) {
infoStream.message("IW", "hit exception updating document");
}
}
if (anySegmentFlushed) {
maybeMerge();
@ -1480,7 +1484,9 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
anySegmentFlushed = docWriter.updateDocument(doc, analyzer, term);
success = true;
} finally {
infoStream.message("IW", "hit exception updating document");
if (!success && infoStream.isEnabled("IW")) {
infoStream.message("IW", "hit exception updating document");
}
}
if (anySegmentFlushed) {
@ -2043,7 +2049,9 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
} catch (OutOfMemoryError oom) {
handleOOM(oom, "deleteAll");
} finally {
infoStream.message("IW", "hit exception during deleteAll");
if (!success && infoStream.isEnabled("IW")) {
infoStream.message("IW", "hit exception during deleteAll");
}
}
}