Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-4245: use IOUtils to close everything in finally block 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1364931 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2012-07-24 08:09:27 +00:00
parent 845a3c3d60
commit 2b53e08898
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
View File

@ -893,6 +893,7 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
} }
} finally { } finally {
try {
// clean up merge scheduler in all cases, although flushing may have failed: // clean up merge scheduler in all cases, although flushing may have failed:
interrupted = Thread.interrupted(); interrupted = Thread.interrupted();
@ -910,8 +911,6 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
} }
} }
mergePolicy.close();
synchronized(this) { synchronized(this) {
for (;;) { for (;;) {
try { try {
@ -930,8 +929,10 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
stopMerges = true; stopMerges = true;
} }
// shutdown scheduler and all threads (this call is not interruptible): } finally {
mergeScheduler.close(); // shutdown policy, scheduler and all threads (this call is not interruptible):
IOUtils.closeWhileHandlingException(mergePolicy, mergeScheduler);
}
} }
if (infoStream.isEnabled("IW")) { if (infoStream.isEnabled("IW")) {