From 3ed03b84883d5a7040dfb8857b11d703c535b11e Mon Sep 17 00:00:00 2001 From: Michael McCandless Date: Sat, 27 Aug 2011 16:25:46 +0000 Subject: [PATCH] LUCENE-3405: rename IOUtils.close methods git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1162394 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/lucene/index/PKIndexSplitter.java | 12 +++- .../lucene/store/NRTCachingDirectory.java | 2 +- .../lucene/index/DocFieldProcessor.java | 4 +- .../org/apache/lucene/index/FieldsReader.java | 4 +- .../org/apache/lucene/index/FieldsWriter.java | 2 +- .../lucene/index/FreqProxTermsWriter.java | 6 +- .../org/apache/lucene/index/IndexWriter.java | 4 +- .../lucene/index/MultiPerDocValues.java | 2 +- .../org/apache/lucene/index/NormsWriter.java | 6 +- .../lucene/index/PerFieldCodecWrapper.java | 14 ++-- .../lucene/index/SegmentCoreReaders.java | 2 +- .../org/apache/lucene/index/SegmentInfos.java | 2 +- .../apache/lucene/index/SegmentMerger.java | 18 +++++- .../lucene/index/TermVectorsReader.java | 2 +- .../lucene/index/TermVectorsTermsWriter.java | 6 +- .../lucene/index/TermVectorsWriter.java | 4 +- .../lucene/index/codecs/BlockTermsWriter.java | 4 +- .../index/codecs/BlockTreeTermsReader.java | 4 +- .../index/codecs/BlockTreeTermsWriter.java | 4 +- .../codecs/DefaultDocValuesProducer.java | 2 +- .../codecs/DefaultSegmentInfosWriter.java | 2 +- .../codecs/FixedGapTermsIndexReader.java | 4 +- .../codecs/FixedGapTermsIndexWriter.java | 8 ++- .../codecs/VariableGapTermsIndexWriter.java | 2 +- .../index/codecs/sep/SepPostingsWriter.java | 4 +- .../org/apache/lucene/index/values/Bytes.java | 4 +- .../index/values/FixedDerefBytesImpl.java | 12 +++- .../index/values/FixedSortedBytesImpl.java | 12 +++- .../index/values/FixedStraightBytesImpl.java | 12 ++-- .../apache/lucene/index/values/Floats.java | 16 +++-- .../apache/lucene/index/values/IntsImpl.java | 20 ++++-- .../index/values/VarDerefBytesImpl.java | 12 +++- .../index/values/VarSortedBytesImpl.java | 12 +++- .../index/values/VarStraightBytesImpl.java | 18 ++++-- .../lucene/store/CompoundFileDirectory.java | 12 ++-- .../lucene/store/CompoundFileWriter.java | 11 ++-- .../org/apache/lucene/store/Directory.java | 2 +- .../java/org/apache/lucene/util/IOUtils.java | 64 ++++++++++++++----- .../mockintblock/MockFixedIntBlockCodec.java | 2 +- .../MockVariableIntBlockCodec.java | 2 +- .../mocksep/MockSingleIntIndexOutput.java | 2 +- .../codecs/preflexrw/PreFlexFieldsWriter.java | 2 +- .../codecs/preflexrw/TermInfosWriter.java | 4 +- .../apache/lucene/search/TestTermVectors.java | 4 +- .../org/apache/lucene/util/TestIOUtils.java | 4 +- .../search/TestMultipleCategoryLists.java | 10 +-- .../facet/search/TestTotalFacetCounts.java | 2 +- .../search/TestTotalFacetCountsCache.java | 6 +- .../taxonomy/lucene/TestAddTaxonomies.java | 4 +- .../lucene/search/suggest/fst/FSTLookup.java | 4 +- .../solr/handler/admin/CoreAdminHandler.java | 2 +- 51 files changed, 254 insertions(+), 125 deletions(-) diff --git a/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java b/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java index b7ee89c18a0..7f707b1e4b0 100644 --- a/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java +++ b/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java @@ -89,7 +89,11 @@ public class PKIndexSplitter { createIndex(config2, dir2, reader, docsInFirstIndex, true); success = true; } finally { - IOUtils.closeSafely(!success, reader); + if (success) { + IOUtils.close(reader); + } else { + IOUtils.closeWhileHandlingException(reader); + } } } @@ -100,7 +104,11 @@ public class PKIndexSplitter { w.addIndexes(new DocumentFilteredIndexReader(reader, preserveFilter, negateFilter)); success = true; } finally { - IOUtils.closeSafely(!success, w); + if (success) { + IOUtils.close(w); + } else { + IOUtils.closeWhileHandlingException(w); + } } } diff --git a/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java b/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java index c11b627e9d0..d0af9aaaf93 100644 --- a/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java +++ b/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java @@ -280,7 +280,7 @@ public class NRTCachingDirectory extends Directory { in = cache.openInput(fileName, context); in.copyBytes(out, in.length()); } finally { - IOUtils.closeSafely(false, in, out); + IOUtils.close(in, out); } synchronized(this) { cache.deleteFile(fileName); diff --git a/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java b/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java index e014ba07677..ec14a922b48 100644 --- a/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java +++ b/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java @@ -87,7 +87,7 @@ final class DocFieldProcessor extends DocConsumer { consumers.finish(state.numDocs); }; // close perDocConsumer during flush to ensure all files are flushed due to PerCodec CFS - IOUtils.closeSafely(false, perDocConsumers.values()); + IOUtils.close(perDocConsumers.values()); } @Override @@ -108,7 +108,7 @@ final class DocFieldProcessor extends DocConsumer { } } try { - IOUtils.closeSafely(true, perDocConsumers.values()); + IOUtils.closeWhileHandlingException(perDocConsumers.values()); // TODO add abort to PerDocConsumer! } catch (IOException e) { // ignore on abort! diff --git a/lucene/src/java/org/apache/lucene/index/FieldsReader.java b/lucene/src/java/org/apache/lucene/index/FieldsReader.java index d40a5fd6f66..8e9ee56fcf9 100644 --- a/lucene/src/java/org/apache/lucene/index/FieldsReader.java +++ b/lucene/src/java/org/apache/lucene/index/FieldsReader.java @@ -174,9 +174,9 @@ public final class FieldsReader implements Cloneable, Closeable { public final void close() throws IOException { if (!closed) { if (isOriginal) { - IOUtils.closeSafely(false, fieldsStream, indexStream, fieldsStreamTL, cloneableFieldsStream, cloneableIndexStream); + IOUtils.close(fieldsStream, indexStream, fieldsStreamTL, cloneableFieldsStream, cloneableIndexStream); } else { - IOUtils.closeSafely(false, fieldsStream, indexStream, fieldsStreamTL); + IOUtils.close(fieldsStream, indexStream, fieldsStreamTL); } closed = true; } diff --git a/lucene/src/java/org/apache/lucene/index/FieldsWriter.java b/lucene/src/java/org/apache/lucene/index/FieldsWriter.java index 74800075a35..a59197f4ee8 100644 --- a/lucene/src/java/org/apache/lucene/index/FieldsWriter.java +++ b/lucene/src/java/org/apache/lucene/index/FieldsWriter.java @@ -111,7 +111,7 @@ final class FieldsWriter { void close() throws IOException { if (directory != null) { try { - IOUtils.closeSafely(false, fieldsStream, indexStream); + IOUtils.close(fieldsStream, indexStream); } finally { fieldsStream = indexStream = null; } diff --git a/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriter.java b/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriter.java index fc99a719202..203580d9b7e 100644 --- a/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriter.java +++ b/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriter.java @@ -105,7 +105,11 @@ final class FreqProxTermsWriter extends TermsHashConsumer { } success = true; } finally { - IOUtils.closeSafely(!success, consumer); + if (success) { + IOUtils.close(consumer); + } else { + IOUtils.closeWhileHandlingException(consumer); + } } } diff --git a/lucene/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/src/java/org/apache/lucene/index/IndexWriter.java index 38658c8a196..c99d0c4f25a 100644 --- a/lucene/src/java/org/apache/lucene/index/IndexWriter.java +++ b/lucene/src/java/org/apache/lucene/index/IndexWriter.java @@ -2270,7 +2270,7 @@ public class IndexWriter implements Closeable, TwoPhaseCommit { } catch(IOException ex) { prior = ex; } finally { - IOUtils.closeSafely(prior, cfsDir); + IOUtils.closeWhileHandlingException(prior, cfsDir); } // Perform the merge @@ -2606,7 +2606,7 @@ public class IndexWriter implements Closeable, TwoPhaseCommit { } } } finally { - IOUtils.closeSafely(false, cfsdir); + IOUtils.close(cfsdir); } info.dir = directory; diff --git a/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java b/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java index b94da880d13..b74f54f0ab0 100644 --- a/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java +++ b/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java @@ -152,7 +152,7 @@ public class MultiPerDocValues extends PerDocValues { } public void close() throws IOException { - IOUtils.closeSafely(false, this.subs); + IOUtils.close(this.subs); } @Override diff --git a/lucene/src/java/org/apache/lucene/index/NormsWriter.java b/lucene/src/java/org/apache/lucene/index/NormsWriter.java index e4353829f01..21a2a2511ad 100644 --- a/lucene/src/java/org/apache/lucene/index/NormsWriter.java +++ b/lucene/src/java/org/apache/lucene/index/NormsWriter.java @@ -88,7 +88,11 @@ final class NormsWriter extends InvertedDocEndConsumer { } success = true; } finally { - IOUtils.closeSafely(!success, normsOut); + if (success) { + IOUtils.close(normsOut); + } else { + IOUtils.closeWhileHandlingException(normsOut); + } } } diff --git a/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java b/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java index 076e21308c6..9e950d15c8b 100644 --- a/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java +++ b/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java @@ -75,7 +75,7 @@ final class PerFieldCodecWrapper extends Codec { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, consumers); + IOUtils.closeWhileHandlingException(consumers); } } } @@ -90,7 +90,7 @@ final class PerFieldCodecWrapper extends Codec { @Override public void close() throws IOException { - IOUtils.closeSafely(false, consumers); + IOUtils.close(consumers); } } @@ -123,7 +123,7 @@ final class PerFieldCodecWrapper extends Codec { // If we hit exception (eg, IOE because writer was // committing, or, for any other reason) we must // go back and close all FieldsProducers we opened: - IOUtils.closeSafely(true, producers.values()); + IOUtils.closeWhileHandlingException(producers.values()); } } } @@ -172,7 +172,7 @@ final class PerFieldCodecWrapper extends Codec { @Override public void close() throws IOException { - IOUtils.closeSafely(false, codecs.values()); + IOUtils.close(codecs.values()); } } @@ -230,7 +230,7 @@ final class PerFieldCodecWrapper extends Codec { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, producers.values()); + IOUtils.closeWhileHandlingException(producers.values()); } } } @@ -249,7 +249,7 @@ final class PerFieldCodecWrapper extends Codec { } public void close() throws IOException { - IOUtils.closeSafely(false, codecs.values()); + IOUtils.close(codecs.values()); } } @@ -266,7 +266,7 @@ final class PerFieldCodecWrapper extends Codec { } public void close() throws IOException { - IOUtils.closeSafely(false, consumers); + IOUtils.close(consumers); } @Override diff --git a/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java b/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java index c0ac39fe403..5cd50977625 100644 --- a/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java +++ b/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java @@ -122,7 +122,7 @@ final class SegmentCoreReaders { synchronized void decRef() throws IOException { if (ref.decrementAndGet() == 0) { - IOUtils.closeSafely(false, fields, perDocProducer, termVectorsReaderOrig, + IOUtils.close(fields, perDocProducer, termVectorsReaderOrig, fieldsReaderOrig, cfsReader, storeCFSReader); // Now, notify any ReaderFinished listeners: if (owner != null) { diff --git a/lucene/src/java/org/apache/lucene/index/SegmentInfos.java b/lucene/src/java/org/apache/lucene/index/SegmentInfos.java index 26e71cf06f6..f9867b8717c 100644 --- a/lucene/src/java/org/apache/lucene/index/SegmentInfos.java +++ b/lucene/src/java/org/apache/lucene/index/SegmentInfos.java @@ -331,7 +331,7 @@ public final class SegmentInfos implements Cloneable, Iterable { if (!success) { // We hit an exception above; try to close the file // but suppress any exception: - IOUtils.closeSafely(true, segnOutput); + IOUtils.closeWhileHandlingException(segnOutput); try { // Try not to leave a truncated segments_N file in // the index: diff --git a/lucene/src/java/org/apache/lucene/index/SegmentMerger.java b/lucene/src/java/org/apache/lucene/index/SegmentMerger.java index 76c0cac2d5d..094adf9593d 100644 --- a/lucene/src/java/org/apache/lucene/index/SegmentMerger.java +++ b/lucene/src/java/org/apache/lucene/index/SegmentMerger.java @@ -573,7 +573,11 @@ final class SegmentMerger { slices.toArray(ReaderUtil.Slice.EMPTY_ARRAY))); success = true; } finally { - IOUtils.closeSafely(!success, consumer); + if (success) { + IOUtils.close(consumer); + } else { + IOUtils.closeWhileHandlingException(consumer); + } } } @@ -602,7 +606,11 @@ final class SegmentMerger { docsConsumer.merge(mergeState, multiPerDocValues); success = true; } finally { - IOUtils.closeSafely(!success, docsConsumer); + if (success) { + IOUtils.close(docsConsumer); + } else { + IOUtils.closeWhileHandlingException(docsConsumer); + } } } /* don't close the perDocProducers here since they are private segment producers @@ -654,7 +662,11 @@ final class SegmentMerger { } success = true; } finally { - IOUtils.closeSafely(!success, output); + if (success) { + IOUtils.close(output); + } else { + IOUtils.closeWhileHandlingException(output); + } } } } diff --git a/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java b/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java index b03463782ff..6bff56b005d 100644 --- a/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java +++ b/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java @@ -193,7 +193,7 @@ class TermVectorsReader implements Cloneable, Closeable { } public void close() throws IOException { - IOUtils.closeSafely(false, tvx, tvd, tvf); + IOUtils.close(tvx, tvd, tvf); } /** diff --git a/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java b/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java index 686c355a476..784ab3a4a70 100644 --- a/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java +++ b/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java @@ -57,7 +57,7 @@ final class TermVectorsTermsWriter extends TermsHashConsumer { fill(state.numDocs); assert state.segmentName != null; String idxName = IndexFileNames.segmentFileName(state.segmentName, "", IndexFileNames.VECTORS_INDEX_EXTENSION); - IOUtils.closeSafely(false, tvx, tvf, tvd); + IOUtils.close(tvx, tvf, tvd); tvx = tvd = tvf = null; if (4+((long) state.numDocs)*16 != state.directory.fileLength(idxName)) { throw new RuntimeException("after flush: tvx size mismatch: " + state.numDocs + " docs vs " + state.directory.fileLength(idxName) + " length in bytes of " + idxName + " file exists?=" + state.directory.fileExists(idxName)); @@ -107,7 +107,7 @@ final class TermVectorsTermsWriter extends TermsHashConsumer { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, tvx, tvd, tvf); + IOUtils.closeWhileHandlingException(tvx, tvd, tvf); } } @@ -161,7 +161,7 @@ final class TermVectorsTermsWriter extends TermsHashConsumer { public void abort() { hasVectors = false; try { - IOUtils.closeSafely(true, tvx, tvd, tvf); + IOUtils.closeWhileHandlingException(tvx, tvd, tvf); } catch (IOException e) { // cannot happen since we suppress exceptions throw new RuntimeException(e); diff --git a/lucene/src/java/org/apache/lucene/index/TermVectorsWriter.java b/lucene/src/java/org/apache/lucene/index/TermVectorsWriter.java index f94365a7e83..6b20f820867 100644 --- a/lucene/src/java/org/apache/lucene/index/TermVectorsWriter.java +++ b/lucene/src/java/org/apache/lucene/index/TermVectorsWriter.java @@ -45,7 +45,7 @@ final class TermVectorsWriter { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, tvx, tvd, tvf); + IOUtils.closeWhileHandlingException(tvx, tvd, tvf); } } @@ -194,6 +194,6 @@ final class TermVectorsWriter { final void close() throws IOException { // make an effort to close all streams we can but remember and re-throw // the first exception encountered in this process - IOUtils.closeSafely(false, tvx, tvd, tvf); + IOUtils.close(tvx, tvd, tvf); } } diff --git a/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java b/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java index 950af269d76..a3ebed27a78 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java @@ -88,7 +88,7 @@ public class BlockTermsWriter extends FieldsConsumer { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, out); + IOUtils.closeWhileHandlingException(out); } } } @@ -138,7 +138,7 @@ public class BlockTermsWriter extends FieldsConsumer { } writeTrailer(dirStart); } finally { - IOUtils.closeSafely(false, out, postingsWriter, termsIndexWriter); + IOUtils.close(out, postingsWriter, termsIndexWriter); } } diff --git a/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java b/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java index f4d48a7546c..b8610609c51 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java @@ -160,7 +160,7 @@ public class BlockTreeTermsReader extends FieldsProducer { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, indexIn, this); + IOUtils.closeWhileHandlingException(indexIn, this); } else if (indexDivisor != -1) { indexIn.close(); } @@ -194,7 +194,7 @@ public class BlockTreeTermsReader extends FieldsProducer { @Override public void close() throws IOException { try { - IOUtils.closeSafely(false, in, postingsReader); + IOUtils.close(in, postingsReader); } finally { for(FieldReader field : fields.values()) { field.close(); diff --git a/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsWriter.java b/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsWriter.java index d4403437c77..d1536c41221 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsWriter.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsWriter.java @@ -171,7 +171,7 @@ public class BlockTreeTermsWriter extends FieldsConsumer { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, out, indexOut); + IOUtils.closeWhileHandlingException(out, indexOut); } } this.indexOut = indexOut; @@ -937,7 +937,7 @@ public class BlockTreeTermsWriter extends FieldsConsumer { } catch (IOException ioe2) { ioe = ioe2; } finally { - IOUtils.closeSafely(ioe, out, indexOut, postingsWriter); + IOUtils.closeWhileHandlingException(ioe, out, indexOut, postingsWriter); } } } diff --git a/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesProducer.java b/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesProducer.java index ad4920fbbdd..30a05695836 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesProducer.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesProducer.java @@ -189,7 +189,7 @@ public class DefaultDocValuesProducer extends PerDocValues { } else { toClose = closeables; } - IOUtils.closeSafely(false, toClose); + IOUtils.close(toClose); } @Override diff --git a/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java b/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java index 8e53aaf4eb9..e0292623e5e 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java @@ -74,7 +74,7 @@ public class DefaultSegmentInfosWriter extends SegmentInfosWriter { return out; } finally { if (!success) { - IOUtils.closeSafely(true, out); + IOUtils.closeWhileHandlingException(out); } } } diff --git a/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java b/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java index 36e82b3323e..6ce2eeb8794 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java @@ -111,7 +111,9 @@ public class FixedGapTermsIndexReader extends TermsIndexReaderBase { } success = true; } finally { - if (!success) IOUtils.closeSafely(true, in); + if (!success) { + IOUtils.closeWhileHandlingException(in); + } if (indexDivisor > 0) { in.close(); in = null; diff --git a/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexWriter.java b/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexWriter.java index 28149ee2533..4d424a6a25e 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexWriter.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexWriter.java @@ -67,7 +67,7 @@ public class FixedGapTermsIndexWriter extends TermsIndexWriterBase { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, out); + IOUtils.closeWhileHandlingException(out); } } } @@ -240,7 +240,11 @@ public class FixedGapTermsIndexWriter extends TermsIndexWriterBase { writeTrailer(dirStart); success = true; } finally { - IOUtils.closeSafely(!success, out); + if (success) { + IOUtils.close(out); + } else { + IOUtils.closeWhileHandlingException(out); + } } } diff --git a/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexWriter.java b/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexWriter.java index c987c9fba69..221451f9bdc 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexWriter.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexWriter.java @@ -168,7 +168,7 @@ public class VariableGapTermsIndexWriter extends TermsIndexWriterBase { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, out); + IOUtils.closeWhileHandlingException(out); } } } diff --git a/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java b/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java index 4b6ee5f240c..05a56390dd4 100644 --- a/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java +++ b/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java @@ -150,7 +150,7 @@ public final class SepPostingsWriter extends PostingsWriterBase { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, docOut, skipOut, freqOut, posOut, payloadOut); + IOUtils.closeWhileHandlingException(docOut, skipOut, freqOut, posOut, payloadOut); } } @@ -389,7 +389,7 @@ public final class SepPostingsWriter extends PostingsWriterBase { @Override public void close() throws IOException { - IOUtils.closeSafely(false, docOut, skipOut, freqOut, posOut, payloadOut); + IOUtils.close(docOut, skipOut, freqOut, posOut, payloadOut); } public static void getExtensions(Set extensions) { diff --git a/lucene/src/java/org/apache/lucene/index/values/Bytes.java b/lucene/src/java/org/apache/lucene/index/values/Bytes.java index f92e6578bab..3de2ae8c975 100644 --- a/lucene/src/java/org/apache/lucene/index/values/Bytes.java +++ b/lucene/src/java/org/apache/lucene/index/values/Bytes.java @@ -368,7 +368,7 @@ public final class Bytes { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, datOut); + IOUtils.closeWhileHandlingException(datOut); } } } @@ -386,7 +386,7 @@ public final class Bytes { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, idxOut); + IOUtils.closeWhileHandlingException(idxOut); } } return idxOut; diff --git a/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java b/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java index 42e1e89f5b6..da86a2388f3 100644 --- a/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java +++ b/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java @@ -112,7 +112,11 @@ class FixedDerefBytesImpl { } success = true; } finally { - IOUtils.closeSafely(!success, datOut); + if (success) { + IOUtils.close(datOut); + } else { + IOUtils.closeWhileHandlingException(datOut); + } hash.close(); } success = false; @@ -134,7 +138,11 @@ class FixedDerefBytesImpl { w.finish(); success = true; } finally { - IOUtils.closeSafely(!success, idxOut); + if (success) { + IOUtils.close(idxOut); + } else { + IOUtils.closeWhileHandlingException(idxOut); + } bytesUsed .addAndGet((-docToID.length) * RamUsageEstimator.NUM_BYTES_INT); docToID = null; diff --git a/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java b/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java index afaf533c621..343b10a00fc 100644 --- a/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java +++ b/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java @@ -126,7 +126,11 @@ class FixedSortedBytesImpl { } success = true; } finally { - IOUtils.closeSafely(!success, datOut); + if (success) { + IOUtils.close(datOut); + } else { + IOUtils.closeWhileHandlingException(datOut); + } hash.close(); } final IndexOutput idxOut = getIndexOut(); @@ -159,7 +163,11 @@ class FixedSortedBytesImpl { } w.finish(); } finally { - IOUtils.closeSafely(!success, idxOut); + if (success) { + IOUtils.close(idxOut); + } else { + IOUtils.closeWhileHandlingException(idxOut); + } bytesUsed.addAndGet((-docToEntry.length) * RamUsageEstimator.NUM_BYTES_INT); docToEntry = null; diff --git a/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java b/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java index 494bea3c389..9da2f126ade 100644 --- a/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java +++ b/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java @@ -123,7 +123,7 @@ class FixedStraightBytesImpl { try { datOut.copyBytes(cloneData, size * maxDocs); } finally { - IOUtils.closeSafely(false, cloneData); + IOUtils.close(cloneData); } lastDocID += maxDocs; @@ -133,7 +133,7 @@ class FixedStraightBytesImpl { success = true; } finally { if (!success) { - IOUtils.closeSafely(!success, datOut); + IOUtils.closeWhileHandlingException(datOut); } } } @@ -194,7 +194,11 @@ class FixedStraightBytesImpl { success = true; } finally { pool.dropBuffersAndReset(); - IOUtils.closeSafely(!success, datOut); + if (success) { + IOUtils.close(datOut); + } else { + IOUtils.closeWhileHandlingException(datOut); + } } } } @@ -231,7 +235,7 @@ class FixedStraightBytesImpl { data = new byte[maxDoc]; datIn.readBytes(data, 0, data.length, false); } finally { - IOUtils.closeSafely(false, datIn); + IOUtils.close(datIn); } } diff --git a/lucene/src/java/org/apache/lucene/index/values/Floats.java b/lucene/src/java/org/apache/lucene/index/values/Floats.java index a8c1e2e04ef..0803c853f63 100644 --- a/lucene/src/java/org/apache/lucene/index/values/Floats.java +++ b/lucene/src/java/org/apache/lucene/index/values/Floats.java @@ -102,7 +102,7 @@ public class Floats { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, datOut); + IOUtils.closeWhileHandlingException(datOut); } } } @@ -214,11 +214,13 @@ public class Floats { bytesUsed.addAndGet(-(RamUsageEstimator.NUM_BYTES_INT * ((values.length)))); values = null; - IOUtils.closeSafely(!success, datOut); + if (success) { + IOUtils.close(datOut); + } else { + IOUtils.closeWhileHandlingException(datOut); + } } } - - } // Writes 8 bytes (double) per value @@ -275,7 +277,11 @@ public class Floats { bytesUsed.addAndGet(-(RamUsageEstimator.NUM_BYTES_LONG * ((values.length)))); values = null; - IOUtils.closeSafely(!success, datOut); + if (success) { + IOUtils.close(datOut); + } else { + IOUtils.closeWhileHandlingException(datOut); + } } } } diff --git a/lucene/src/java/org/apache/lucene/index/values/IntsImpl.java b/lucene/src/java/org/apache/lucene/index/values/IntsImpl.java index 8f8e85da443..e74db091360 100644 --- a/lucene/src/java/org/apache/lucene/index/values/IntsImpl.java +++ b/lucene/src/java/org/apache/lucene/index/values/IntsImpl.java @@ -131,7 +131,7 @@ class IntsImpl { } finally { if (!success) { - IOUtils.closeSafely(true, datOut); + IOUtils.closeWhileHandlingException(datOut); } } } @@ -152,7 +152,11 @@ class IntsImpl { } success = true; } finally { - IOUtils.closeSafely(!success, datOut); + if (success) { + IOUtils.close(datOut); + } else { + IOUtils.closeWhileHandlingException(datOut); + } array.clear(); } } @@ -286,7 +290,7 @@ class IntsImpl { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, datIn); + IOUtils.closeWhileHandlingException(datIn); } } } @@ -301,7 +305,11 @@ class IntsImpl { datOut.copyBytes(indexInput, bytesPerValue(type) * numDocs); success = true; } finally { - IOUtils.closeSafely(!success, indexInput); + if (success) { + IOUtils.close(indexInput); + } else { + IOUtils.closeWhileHandlingException(indexInput); + } } return numDocs; } @@ -323,7 +331,7 @@ class IntsImpl { return source; } finally { if (!success) { - IOUtils.closeSafely(true, input, datIn); + IOUtils.closeWhileHandlingException(input, datIn); } } } @@ -345,7 +353,7 @@ class IntsImpl { return inst; } finally { if (!success) { - IOUtils.closeSafely(true, input); + IOUtils.closeWhileHandlingException(input); } } } diff --git a/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java b/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java index c862dd1103c..91be0f87bfa 100644 --- a/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java +++ b/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java @@ -184,7 +184,11 @@ class VarDerefBytesImpl { success = true; } finally { hash.close(); - IOUtils.closeSafely(!success, datOut); + if (success) { + IOUtils.close(datOut); + } else { + IOUtils.closeWhileHandlingException(datOut); + } } final IndexOutput idxOut = getIndexOut(); @@ -211,7 +215,11 @@ class VarDerefBytesImpl { w.finish(); success = true; } finally { - IOUtils.closeSafely(!success,idxOut); + if (success) { + IOUtils.close(idxOut); + } else { + IOUtils.closeWhileHandlingException(idxOut); + } bytesUsed.addAndGet(RamUsageEstimator.NUM_BYTES_INT * (-docToAddress.length)); docToAddress = null; diff --git a/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java b/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java index 3e884b391d2..c6a4300b981 100644 --- a/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java +++ b/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java @@ -124,7 +124,11 @@ class VarSortedBytesImpl { } success = true; } finally { - IOUtils.closeSafely(!success, datOut); + if (success) { + IOUtils.close(datOut); + } else { + IOUtils.closeWhileHandlingException(datOut); + } hash.close(); } final IndexOutput idxOut = getIndexOut(); @@ -161,7 +165,11 @@ class VarSortedBytesImpl { bytesUsed.addAndGet((-docToEntry.length) * RamUsageEstimator.NUM_BYTES_INT); docToEntry = null; - IOUtils.closeSafely(!success, idxOut); + if (success) { + IOUtils.close(idxOut); + } else { + IOUtils.closeWhileHandlingException(idxOut); + } } } } diff --git a/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java b/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java index 61125aa23bd..e4182ec0505 100644 --- a/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java +++ b/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java @@ -128,13 +128,13 @@ class VarStraightBytesImpl { address += numDataBytes; // this is the address after all addr pointers are updated iter.close(); } finally { - IOUtils.closeSafely(false, cloneIdx); + IOUtils.close(cloneIdx); } final IndexInput cloneData = reader.cloneData(); try { datOut.copyBytes(cloneData, numDataBytes); } finally { - IOUtils.closeSafely(false, cloneData); + IOUtils.close(cloneData); } } else { super.merge(state); @@ -142,7 +142,7 @@ class VarStraightBytesImpl { success = true; } finally { if (!success) { - IOUtils.closeSafely(!success, datOut); + IOUtils.closeWhileHandlingException(datOut); } } } @@ -174,7 +174,11 @@ class VarStraightBytesImpl { } success = true; } finally { - IOUtils.closeSafely(!success, datOut); + if (success) { + IOUtils.close(datOut); + } else { + IOUtils.closeWhileHandlingException(datOut); + } pool.dropBuffersAndReset(); } @@ -204,7 +208,11 @@ class VarStraightBytesImpl { bytesUsed.addAndGet(-(docToAddress.length) * RamUsageEstimator.NUM_BYTES_INT); docToAddress = null; - IOUtils.closeSafely(!success, idxOut); + if (success) { + IOUtils.close(idxOut); + } else { + IOUtils.closeWhileHandlingException(idxOut); + } } } diff --git a/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java b/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java index f9a477cfa5a..c8ed7720c29 100644 --- a/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java +++ b/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java @@ -68,7 +68,7 @@ public final class CompoundFileDirectory extends Directory { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, handle); + IOUtils.closeWhileHandlingException(handle); } } this.isOpen = true; @@ -112,7 +112,7 @@ public final class CompoundFileDirectory extends Directory { } return mapping; } finally { - IOUtils.closeSafely(false, input); + IOUtils.close(input); } } else { // TODO remove once 3.x is not supported anymore @@ -121,7 +121,11 @@ public final class CompoundFileDirectory extends Directory { success = true; return mapping; } finally { - IOUtils.closeSafely(!success, stream); + if (success) { + IOUtils.close(stream); + } else { + IOUtils.closeWhileHandlingException(stream); + } } } @@ -196,7 +200,7 @@ public final class CompoundFileDirectory extends Directory { assert openForWrite; writer.close(); } else { - IOUtils.closeSafely(false, handle); + IOUtils.close(handle); } } diff --git a/lucene/src/java/org/apache/lucene/store/CompoundFileWriter.java b/lucene/src/java/org/apache/lucene/store/CompoundFileWriter.java index 80a1367ee48..4508172ab48 100644 --- a/lucene/src/java/org/apache/lucene/store/CompoundFileWriter.java +++ b/lucene/src/java/org/apache/lucene/store/CompoundFileWriter.java @@ -117,7 +117,7 @@ final class CompoundFileWriter implements Closeable{ success = true; } finally { if (!success) { - IOUtils.closeSafely(true, dataOut); + IOUtils.closeWhileHandlingException(dataOut); } } } @@ -157,7 +157,7 @@ final class CompoundFileWriter implements Closeable{ } catch (IOException e) { priorException = e; } finally { - IOUtils.closeSafely(priorException, dataOut); + IOUtils.closeWhileHandlingException(priorException, dataOut); } try { entryTableOut = directory.createOutput(entryTableName, IOContext.DEFAULT); @@ -165,7 +165,7 @@ final class CompoundFileWriter implements Closeable{ } catch (IOException e) { priorException = e; } finally { - IOUtils.closeSafely(priorException, entryTableOut); + IOUtils.closeWhileHandlingException(priorException, entryTableOut); } } @@ -205,13 +205,14 @@ final class CompoundFileWriter implements Closeable{ success = true; return length; } finally { - IOUtils.closeSafely(!success, is); if (success) { + IOUtils.close(is); // copy successful - delete file fileEntry.dir.deleteFile(fileEntry.file); + } else { + IOUtils.closeWhileHandlingException(is); } } - } protected void writeEntryTable(Collection entries, diff --git a/lucene/src/java/org/apache/lucene/store/Directory.java b/lucene/src/java/org/apache/lucene/store/Directory.java index 58fd3ca87bc..339b161c937 100644 --- a/lucene/src/java/org/apache/lucene/store/Directory.java +++ b/lucene/src/java/org/apache/lucene/store/Directory.java @@ -204,7 +204,7 @@ public abstract class Directory implements Closeable { } catch (IOException ioe) { priorException = ioe; } finally { - IOUtils.closeSafely(priorException, os, is); + IOUtils.closeWhileHandlingException(priorException, os, is); } } diff --git a/lucene/src/java/org/apache/lucene/util/IOUtils.java b/lucene/src/java/org/apache/lucene/util/IOUtils.java index 157634e09be..519ce73b883 100644 --- a/lucene/src/java/org/apache/lucene/util/IOUtils.java +++ b/lucene/src/java/org/apache/lucene/util/IOUtils.java @@ -49,7 +49,7 @@ public final class IOUtils { * @param priorException null or an exception that will be rethrown after method completion * @param objects objects to call close() on */ - public static void closeSafely(E priorException, Closeable... objects) throws E, IOException { + public static void closeWhileHandlingException(E priorException, Closeable... objects) throws E, IOException { Throwable th = null; for (Closeable object : objects) { @@ -76,7 +76,7 @@ public final class IOUtils { } /** @see #closeSafely(Exception, Closeable...) */ - public static void closeSafely(E priorException, Iterable objects) throws E, IOException { + public static void closeWhileHandlingException(E priorException, Iterable objects) throws E, IOException { Throwable th = null; for (Closeable object : objects) { @@ -103,18 +103,16 @@ public final class IOUtils { } /** - * Closes all given Closeables, suppressing all thrown exceptions. - * Some of the Closeables may be null, they are ignored. After - * everything is closed, and if {@code suppressExceptions} is {@code false}, - * method either throws the first of suppressed exceptions, or completes - * normally. + * Closes all given Closeables. Some of the + * Closeables may be null; they are + * ignored. After everything is closed, the method either + * throws the first exception it hit while closing, or + * completes normally if there were no exceptions. * - * @param suppressExceptions - * if true then exceptions that occur during close() are suppressed * @param objects * objects to call close() on */ - public static void closeSafely(boolean suppressExceptions, Closeable... objects) throws IOException { + public static void close(Closeable... objects) throws IOException { Throwable th = null; for (Closeable object : objects) { @@ -124,12 +122,13 @@ public final class IOUtils { } } catch (Throwable t) { addSuppressed(th, t); - if (th == null) + if (th == null) { th = t; + } } } - if (th != null && !suppressExceptions) { + if (th != null) { if (th instanceof IOException) throw (IOException) th; if (th instanceof RuntimeException) throw (RuntimeException) th; if (th instanceof Error) throw (Error) th; @@ -138,9 +137,9 @@ public final class IOUtils { } /** - * @see #closeSafely(boolean, Closeable...) + * @see #close(Closeable...) */ - public static void closeSafely(boolean suppressExceptions, Iterable objects) throws IOException { + public static void close(Iterable objects) throws IOException { Throwable th = null; for (Closeable object : objects) { @@ -150,18 +149,51 @@ public final class IOUtils { } } catch (Throwable t) { addSuppressed(th, t); - if (th == null) + if (th == null) { th = t; + } } } - if (th != null && !suppressExceptions) { + if (th != null) { if (th instanceof IOException) throw (IOException) th; if (th instanceof RuntimeException) throw (RuntimeException) th; if (th instanceof Error) throw (Error) th; throw new RuntimeException(th); } } + + /** + * Closes all given Closeables, suppressing all thrown exceptions. + * Some of the Closeables may be null, they are ignored. + * + * @param objects + * objects to call close() on + */ + public static void closeWhileHandlingException(Closeable... objects) throws IOException { + for (Closeable object : objects) { + try { + if (object != null) { + object.close(); + } + } catch (Throwable t) { + } + } + } + + /** + * @see #closeSafely(boolean, Closeable...) + */ + public static void closeWhileHandlingException(Iterable objects) throws IOException { + for (Closeable object : objects) { + try { + if (object != null) { + object.close(); + } + } catch (Throwable t) { + } + } + } /** This reflected {@link Method} is {@code null} before Java 7 */ private static final Method SUPPRESS_METHOD; diff --git a/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockCodec.java b/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockCodec.java index 087d3be419b..f8c87dc7f00 100644 --- a/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockCodec.java +++ b/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockCodec.java @@ -119,7 +119,7 @@ public class MockFixedIntBlockCodec extends Codec { return ret; } finally { if (!success) { - IOUtils.closeSafely(true, out); + IOUtils.closeWhileHandlingException(out); } } } diff --git a/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockCodec.java b/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockCodec.java index 38950cae14c..1256ab455a5 100644 --- a/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockCodec.java +++ b/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockCodec.java @@ -142,7 +142,7 @@ public class MockVariableIntBlockCodec extends Codec { return ret; } finally { if (!success) { - IOUtils.closeSafely(true, out); + IOUtils.closeWhileHandlingException(out); } } } diff --git a/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java b/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java index 006299e9039..83a7f3b6e56 100644 --- a/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java +++ b/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java @@ -44,7 +44,7 @@ public class MockSingleIntIndexOutput extends IntIndexOutput { success = true; } finally { if (!success) { - IOUtils.closeSafely(true, out); + IOUtils.closeWhileHandlingException(out); } } } diff --git a/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexFieldsWriter.java b/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexFieldsWriter.java index fde9b57f8f3..e80a5be0745 100644 --- a/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexFieldsWriter.java +++ b/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexFieldsWriter.java @@ -78,7 +78,7 @@ class PreFlexFieldsWriter extends FieldsConsumer { @Override public void close() throws IOException { - IOUtils.closeSafely(false, termsOut, freqOut, proxOut); + IOUtils.close(termsOut, freqOut, proxOut); } private class PreFlexTermsWriter extends TermsConsumer { diff --git a/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java b/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java index 517991277a5..34a79ef99ba 100644 --- a/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java +++ b/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java @@ -98,7 +98,7 @@ final class TermInfosWriter implements Closeable { } finally { if (!success) { try { - IOUtils.closeSafely(true, output); + IOUtils.closeWhileHandlingException(output); } catch (IOException e) { // cannot happen since we suppress exceptions throw new RuntimeException(e); @@ -139,7 +139,7 @@ final class TermInfosWriter implements Closeable { } finally { if (!success) { try { - IOUtils.closeSafely(true, output); + IOUtils.closeWhileHandlingException(output); } catch (IOException e) { // cannot happen since we suppress exceptions throw new RuntimeException(e); diff --git a/lucene/src/test/org/apache/lucene/search/TestTermVectors.java b/lucene/src/test/org/apache/lucene/search/TestTermVectors.java index 8af0f92fe70..e67fe8801f3 100644 --- a/lucene/src/test/org/apache/lucene/search/TestTermVectors.java +++ b/lucene/src/test/org/apache/lucene/search/TestTermVectors.java @@ -541,7 +541,7 @@ public class TestTermVectors extends LuceneTestCase { verifyIndex(target); - IOUtils.closeSafely(false, target, input[0], input[1]); + IOUtils.close(target, input[0], input[1]); } public void testOptimizeAddIndexesReader() throws Exception { @@ -562,7 +562,7 @@ public class TestTermVectors extends LuceneTestCase { writer.close(); verifyIndex(target); - IOUtils.closeSafely(false, target, input[0], input[1]); + IOUtils.close(target, input[0], input[1]); } } diff --git a/lucene/src/test/org/apache/lucene/util/TestIOUtils.java b/lucene/src/test/org/apache/lucene/util/TestIOUtils.java index 134f6662cdc..8b7ded80810 100644 --- a/lucene/src/test/org/apache/lucene/util/TestIOUtils.java +++ b/lucene/src/test/org/apache/lucene/util/TestIOUtils.java @@ -59,7 +59,7 @@ public class TestIOUtils extends LuceneTestCase { // test with prior exception try { final TestException t = new TestException(); - IOUtils.closeSafely(t, new BrokenCloseable(1), new BrokenCloseable(2)); + IOUtils.closeWhileHandlingException(t, new BrokenCloseable(1), new BrokenCloseable(2)); } catch (TestException e1) { assertEquals("BASE-EXCEPTION", e1.getMessage()); final StringWriter sw = new StringWriter(); @@ -83,7 +83,7 @@ public class TestIOUtils extends LuceneTestCase { // test without prior exception try { - IOUtils.closeSafely((TestException) null, new BrokenCloseable(1), new BrokenCloseable(2)); + IOUtils.closeWhileHandlingException((TestException) null, new BrokenCloseable(1), new BrokenCloseable(2)); } catch (TestException e1) { fail("TestException should not be thrown here"); } catch (IOException e2) { diff --git a/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java b/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java index 1a35ef17c0e..d68b9dcf0b7 100644 --- a/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java +++ b/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java @@ -99,7 +99,7 @@ public class TestMultipleCategoryLists extends LuceneTestCase { searcher.close(); iw.close(); tw.close(); - IOUtils.closeSafely(false, dirs[0]); + IOUtils.close(dirs[0]); } @Test @@ -140,7 +140,7 @@ public class TestMultipleCategoryLists extends LuceneTestCase { searcher.close(); iw.close(); tw.close(); - IOUtils.closeSafely(false, dirs[0]); + IOUtils.close(dirs[0]); } @Test @@ -184,7 +184,7 @@ public class TestMultipleCategoryLists extends LuceneTestCase { searcher.close(); iw.close(); tw.close(); - IOUtils.closeSafely(false, dirs[0]); + IOUtils.close(dirs[0]); } private void assertPostingListExists(String field, String text, IndexReader ir) throws IOException { @@ -230,7 +230,7 @@ public class TestMultipleCategoryLists extends LuceneTestCase { searcher.close(); iw.close(); tw.close(); - IOUtils.closeSafely(false, dirs[0]); + IOUtils.close(dirs[0]); } @Test @@ -275,7 +275,7 @@ public class TestMultipleCategoryLists extends LuceneTestCase { searcher.close(); iw.close(); tw.close(); - IOUtils.closeSafely(false, dirs[0]); + IOUtils.close(dirs[0]); } private Directory[][] getDirs() throws IOException { diff --git a/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java b/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java index c26bd0aa4f0..4974945b8fd 100644 --- a/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java +++ b/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java @@ -109,7 +109,7 @@ public class TestTotalFacetCounts extends LuceneTestCase { ++partition; } readers[0].close(); - IOUtils.closeSafely(false, dirs[0]); + IOUtils.close(dirs[0]); tmpFile.delete(); } diff --git a/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java b/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java index c109b594a53..b1e28c4a876 100644 --- a/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java +++ b/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java @@ -339,7 +339,7 @@ public class TestTotalFacetCountsCache extends LuceneTestCase { readers[0].close(); r2.close(); outputFile.delete(); - IOUtils.closeSafely(false, dirs[0]); + IOUtils.close(dirs[0]); } private int assertReadFromDisc(TotalFacetCounts totalCounts, int prevGen, String errMsg) { @@ -405,7 +405,7 @@ public class TestTotalFacetCountsCache extends LuceneTestCase { outputFile.delete(); writers[0].close(); readers[0].close(); - IOUtils.closeSafely(false, dirs[0]); + IOUtils.close(dirs[0]); } /** @@ -535,7 +535,7 @@ public class TestTotalFacetCountsCache extends LuceneTestCase { readers[0].close(); readers[1].close(); for (Directory[] dirset : dirs) { - IOUtils.closeSafely(false, dirset); + IOUtils.close(dirset); } } diff --git a/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java b/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java index ad58fb29bd3..2dfb5ecd00a 100644 --- a/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java +++ b/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java @@ -247,8 +247,8 @@ public class TestAddTaxonomies extends LuceneTestCase { } main.close(); - IOUtils.closeSafely(false, dirs); - IOUtils.closeSafely(false, copydirs); + IOUtils.close(dirs); + IOUtils.close(copydirs); } } diff --git a/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTLookup.java b/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTLookup.java index 8b927726230..a7c4e498d62 100644 --- a/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTLookup.java +++ b/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTLookup.java @@ -515,7 +515,7 @@ public class FSTLookup extends Lookup { this.automaton = new FST(new InputStreamDataInput(is), NoOutputs.getSingleton()); cacheRootArcs(); } finally { - IOUtils.closeSafely(false, is); + IOUtils.close(is); } return true; } @@ -537,7 +537,7 @@ public class FSTLookup extends Lookup { try { this.automaton.save(new OutputStreamDataOutput(os)); } finally { - IOUtils.closeSafely(false, os); + IOUtils.close(os); } return true; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java index 18d8e48a154..211f6968e99 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java @@ -247,7 +247,7 @@ public class CoreAdminHandler extends RequestHandlerBase { if (solrCore != null) solrCore.close(); } } - if (readersToBeClosed != null) IOUtils.closeSafely(true, readersToBeClosed); + if (readersToBeClosed != null) IOUtils.closeWhileHandlingException(readersToBeClosed); if (dirsToBeReleased != null) { for (Directory dir : dirsToBeReleased) { DirectoryFactory dirFactory = core.getDirectoryFactory();