You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/08/27 18:25:47 UTC
svn commit: r1162394 - in /lucene/dev/trunk:
lucene/contrib/misc/src/java/org/apache/lucene/index/
lucene/contrib/misc/src/java/org/apache/lucene/store/
lucene/src/java/org/apache/lucene/index/
lucene/src/java/org/apache/lucene/index/codecs/ lucene/src...
Author: mikemccand
Date: Sat Aug 27 16:25:46 2011
New Revision: 1162394
URL: http://svn.apache.org/viewvc?rev=1162394&view=rev
Log:
LUCENE-3405: rename IOUtils.close methods
Modified:
lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java
lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsReader.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/NormsWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesProducer.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/Bytes.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/Floats.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/IntsImpl.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/Directory.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/IOUtils.java
lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockCodec.java
lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockCodec.java
lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java
lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexFieldsWriter.java
lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestIOUtils.java
lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java
lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java
lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java
lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java
lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTLookup.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Modified: lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java Sat Aug 27 16:25:46 2011
@@ -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);
+ }
}
}
Modified: lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java Sat Aug 27 16:25:46 2011
@@ -280,7 +280,7 @@ public class NRTCachingDirectory extends
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);
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java Sat Aug 27 16:25:46 2011
@@ -87,7 +87,7 @@ final class DocFieldProcessor extends Do
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 Do
}
}
try {
- IOUtils.closeSafely(true, perDocConsumers.values());
+ IOUtils.closeWhileHandlingException(perDocConsumers.values());
// TODO add abort to PerDocConsumer!
} catch (IOException e) {
// ignore on abort!
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsReader.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsReader.java Sat Aug 27 16:25:46 2011
@@ -174,9 +174,9 @@ public final class FieldsReader implemen
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;
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsWriter.java Sat Aug 27 16:25:46 2011
@@ -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;
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriter.java Sat Aug 27 16:25:46 2011
@@ -105,7 +105,11 @@ final class FreqProxTermsWriter extends
}
success = true;
} finally {
- IOUtils.closeSafely(!success, consumer);
+ if (success) {
+ IOUtils.close(consumer);
+ } else {
+ IOUtils.closeWhileHandlingException(consumer);
+ }
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java Sat Aug 27 16:25:46 2011
@@ -2270,7 +2270,7 @@ public class IndexWriter implements Clos
} 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 Clos
}
}
} finally {
- IOUtils.closeSafely(false, cfsdir);
+ IOUtils.close(cfsdir);
}
info.dir = directory;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/MultiPerDocValues.java Sat Aug 27 16:25:46 2011
@@ -152,7 +152,7 @@ public class MultiPerDocValues extends P
}
public void close() throws IOException {
- IOUtils.closeSafely(false, this.subs);
+ IOUtils.close(this.subs);
}
@Override
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/NormsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/NormsWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/NormsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/NormsWriter.java Sat Aug 27 16:25:46 2011
@@ -88,7 +88,11 @@ final class NormsWriter extends Inverted
}
success = true;
} finally {
- IOUtils.closeSafely(!success, normsOut);
+ if (success) {
+ IOUtils.close(normsOut);
+ } else {
+ IOUtils.closeWhileHandlingException(normsOut);
+ }
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/PerFieldCodecWrapper.java Sat Aug 27 16:25:46 2011
@@ -75,7 +75,7 @@ final class PerFieldCodecWrapper extends
success = true;
} finally {
if (!success) {
- IOUtils.closeSafely(true, consumers);
+ IOUtils.closeWhileHandlingException(consumers);
}
}
}
@@ -90,7 +90,7 @@ final class PerFieldCodecWrapper extends
@Override
public void close() throws IOException {
- IOUtils.closeSafely(false, consumers);
+ IOUtils.close(consumers);
}
}
@@ -123,7 +123,7 @@ final class PerFieldCodecWrapper extends
// 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
@Override
public void close() throws IOException {
- IOUtils.closeSafely(false, codecs.values());
+ IOUtils.close(codecs.values());
}
}
@@ -230,7 +230,7 @@ final class PerFieldCodecWrapper extends
success = true;
} finally {
if (!success) {
- IOUtils.closeSafely(true, producers.values());
+ IOUtils.closeWhileHandlingException(producers.values());
}
}
}
@@ -249,7 +249,7 @@ final class PerFieldCodecWrapper extends
}
public void close() throws IOException {
- IOUtils.closeSafely(false, codecs.values());
+ IOUtils.close(codecs.values());
}
}
@@ -266,7 +266,7 @@ final class PerFieldCodecWrapper extends
}
public void close() throws IOException {
- IOUtils.closeSafely(false, consumers);
+ IOUtils.close(consumers);
}
@Override
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java Sat Aug 27 16:25:46 2011
@@ -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) {
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfos.java Sat Aug 27 16:25:46 2011
@@ -331,7 +331,7 @@ public final class SegmentInfos implemen
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:
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java Sat Aug 27 16:25:46 2011
@@ -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);
+ }
}
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java Sat Aug 27 16:25:46 2011
@@ -193,7 +193,7 @@ class TermVectorsReader implements Clone
}
public void close() throws IOException {
- IOUtils.closeSafely(false, tvx, tvd, tvf);
+ IOUtils.close(tvx, tvd, tvf);
}
/**
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsTermsWriter.java Sat Aug 27 16:25:46 2011
@@ -57,7 +57,7 @@ final class TermVectorsTermsWriter exten
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 exten
success = true;
} finally {
if (!success) {
- IOUtils.closeSafely(true, tvx, tvd, tvf);
+ IOUtils.closeWhileHandlingException(tvx, tvd, tvf);
}
}
@@ -161,7 +161,7 @@ final class TermVectorsTermsWriter exten
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);
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsWriter.java Sat Aug 27 16:25:46 2011
@@ -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);
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java Sat Aug 27 16:25:46 2011
@@ -88,7 +88,7 @@ public class BlockTermsWriter extends Fi
success = true;
} finally {
if (!success) {
- IOUtils.closeSafely(true, out);
+ IOUtils.closeWhileHandlingException(out);
}
}
}
@@ -138,7 +138,7 @@ public class BlockTermsWriter extends Fi
}
writeTrailer(dirStart);
} finally {
- IOUtils.closeSafely(false, out, postingsWriter, termsIndexWriter);
+ IOUtils.close(out, postingsWriter, termsIndexWriter);
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java Sat Aug 27 16:25:46 2011
@@ -160,7 +160,7 @@ public class BlockTreeTermsReader extend
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 extend
@Override
public void close() throws IOException {
try {
- IOUtils.closeSafely(false, in, postingsReader);
+ IOUtils.close(in, postingsReader);
} finally {
for(FieldReader field : fields.values()) {
field.close();
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsWriter.java Sat Aug 27 16:25:46 2011
@@ -171,7 +171,7 @@ public class BlockTreeTermsWriter extend
success = true;
} finally {
if (!success) {
- IOUtils.closeSafely(true, out, indexOut);
+ IOUtils.closeWhileHandlingException(out, indexOut);
}
}
this.indexOut = indexOut;
@@ -937,7 +937,7 @@ public class BlockTreeTermsWriter extend
} catch (IOException ioe2) {
ioe = ioe2;
} finally {
- IOUtils.closeSafely(ioe, out, indexOut, postingsWriter);
+ IOUtils.closeWhileHandlingException(ioe, out, indexOut, postingsWriter);
}
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesProducer.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesProducer.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesProducer.java Sat Aug 27 16:25:46 2011
@@ -189,7 +189,7 @@ public class DefaultDocValuesProducer ex
} else {
toClose = closeables;
}
- IOUtils.closeSafely(false, toClose);
+ IOUtils.close(toClose);
}
@Override
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/DefaultSegmentInfosWriter.java Sat Aug 27 16:25:46 2011
@@ -74,7 +74,7 @@ public class DefaultSegmentInfosWriter e
return out;
} finally {
if (!success) {
- IOUtils.closeSafely(true, out);
+ IOUtils.closeWhileHandlingException(out);
}
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java Sat Aug 27 16:25:46 2011
@@ -111,7 +111,9 @@ public class FixedGapTermsIndexReader ex
}
success = true;
} finally {
- if (!success) IOUtils.closeSafely(true, in);
+ if (!success) {
+ IOUtils.closeWhileHandlingException(in);
+ }
if (indexDivisor > 0) {
in.close();
in = null;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexWriter.java Sat Aug 27 16:25:46 2011
@@ -67,7 +67,7 @@ public class FixedGapTermsIndexWriter ex
success = true;
} finally {
if (!success) {
- IOUtils.closeSafely(true, out);
+ IOUtils.closeWhileHandlingException(out);
}
}
}
@@ -240,7 +240,11 @@ public class FixedGapTermsIndexWriter ex
writeTrailer(dirStart);
success = true;
} finally {
- IOUtils.closeSafely(!success, out);
+ if (success) {
+ IOUtils.close(out);
+ } else {
+ IOUtils.closeWhileHandlingException(out);
+ }
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexWriter.java Sat Aug 27 16:25:46 2011
@@ -168,7 +168,7 @@ public class VariableGapTermsIndexWriter
success = true;
} finally {
if (!success) {
- IOUtils.closeSafely(true, out);
+ IOUtils.closeWhileHandlingException(out);
}
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java Sat Aug 27 16:25:46 2011
@@ -150,7 +150,7 @@ public final class SepPostingsWriter ext
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 ext
@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<String> extensions) {
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/Bytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/Bytes.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/Bytes.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/Bytes.java Sat Aug 27 16:25:46 2011
@@ -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;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedDerefBytesImpl.java Sat Aug 27 16:25:46 2011
@@ -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;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedSortedBytesImpl.java Sat Aug 27 16:25:46 2011
@@ -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;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java Sat Aug 27 16:25:46 2011
@@ -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);
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/Floats.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/Floats.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/Floats.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/Floats.java Sat Aug 27 16:25:46 2011
@@ -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);
+ }
}
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/IntsImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/IntsImpl.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/IntsImpl.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/IntsImpl.java Sat Aug 27 16:25:46 2011
@@ -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);
}
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarDerefBytesImpl.java Sat Aug 27 16:25:46 2011
@@ -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;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarSortedBytesImpl.java Sat Aug 27 16:25:46 2011
@@ -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);
+ }
}
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java Sat Aug 27 16:25:46 2011
@@ -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);
+ }
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java Sat Aug 27 16:25:46 2011
@@ -68,7 +68,7 @@ public final class CompoundFileDirectory
success = true;
} finally {
if (!success) {
- IOUtils.closeSafely(true, handle);
+ IOUtils.closeWhileHandlingException(handle);
}
}
this.isOpen = true;
@@ -112,7 +112,7 @@ public final class CompoundFileDirectory
}
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
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
assert openForWrite;
writer.close();
} else {
- IOUtils.closeSafely(false, handle);
+ IOUtils.close(handle);
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileWriter.java Sat Aug 27 16:25:46 2011
@@ -117,7 +117,7 @@ final class CompoundFileWriter implement
success = true;
} finally {
if (!success) {
- IOUtils.closeSafely(true, dataOut);
+ IOUtils.closeWhileHandlingException(dataOut);
}
}
}
@@ -157,7 +157,7 @@ final class CompoundFileWriter implement
} 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 implement
} catch (IOException e) {
priorException = e;
} finally {
- IOUtils.closeSafely(priorException, entryTableOut);
+ IOUtils.closeWhileHandlingException(priorException, entryTableOut);
}
}
@@ -205,13 +205,14 @@ final class CompoundFileWriter implement
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<FileEntry> entries,
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/Directory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/Directory.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/Directory.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/Directory.java Sat Aug 27 16:25:46 2011
@@ -204,7 +204,7 @@ public abstract class Directory implemen
} catch (IOException ioe) {
priorException = ioe;
} finally {
- IOUtils.closeSafely(priorException, os, is);
+ IOUtils.closeWhileHandlingException(priorException, os, is);
}
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/IOUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/IOUtils.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/IOUtils.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/util/IOUtils.java Sat Aug 27 16:25:46 2011
@@ -49,7 +49,7 @@ public final class IOUtils {
* @param priorException <tt>null</tt> or an exception that will be rethrown after method completion
* @param objects objects to call <tt>close()</tt> on
*/
- public static <E extends Exception> void closeSafely(E priorException, Closeable... objects) throws E, IOException {
+ public static <E extends Exception> 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 <E extends Exception> void closeSafely(E priorException, Iterable<Closeable> objects) throws E, IOException {
+ public static <E extends Exception> void closeWhileHandlingException(E priorException, Iterable<Closeable> objects) throws E, IOException {
Throwable th = null;
for (Closeable object : objects) {
@@ -103,18 +103,16 @@ public final class IOUtils {
}
/**
- * Closes all given <tt>Closeable</tt>s, suppressing all thrown exceptions.
- * Some of the <tt>Closeable</tt>s 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 <tt>Closeable</tt>s. Some of the
+ * <tt>Closeable</tt>s 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 <tt>close()</tt> 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<? extends Closeable> objects) throws IOException {
+ public static void close(Iterable<? extends Closeable> 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 <tt>Closeable</tt>s, suppressing all thrown exceptions.
+ * Some of the <tt>Closeable</tt>s may be null, they are ignored.
+ *
+ * @param objects
+ * objects to call <tt>close()</tt> 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<? extends Closeable> 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;
Modified: lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockCodec.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockCodec.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockCodec.java Sat Aug 27 16:25:46 2011
@@ -119,7 +119,7 @@ public class MockFixedIntBlockCodec exte
return ret;
} finally {
if (!success) {
- IOUtils.closeSafely(true, out);
+ IOUtils.closeWhileHandlingException(out);
}
}
}
Modified: lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockCodec.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockCodec.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockCodec.java Sat Aug 27 16:25:46 2011
@@ -142,7 +142,7 @@ public class MockVariableIntBlockCodec e
return ret;
} finally {
if (!success) {
- IOUtils.closeSafely(true, out);
+ IOUtils.closeWhileHandlingException(out);
}
}
}
Modified: lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSingleIntIndexOutput.java Sat Aug 27 16:25:46 2011
@@ -44,7 +44,7 @@ public class MockSingleIntIndexOutput ex
success = true;
} finally {
if (!success) {
- IOUtils.closeSafely(true, out);
+ IOUtils.closeWhileHandlingException(out);
}
}
}
Modified: lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexFieldsWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexFieldsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/PreFlexFieldsWriter.java Sat Aug 27 16:25:46 2011
@@ -78,7 +78,7 @@ class PreFlexFieldsWriter extends Fields
@Override
public void close() throws IOException {
- IOUtils.closeSafely(false, termsOut, freqOut, proxOut);
+ IOUtils.close(termsOut, freqOut, proxOut);
}
private class PreFlexTermsWriter extends TermsConsumer {
Modified: lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java Sat Aug 27 16:25:46 2011
@@ -98,7 +98,7 @@ final class TermInfosWriter implements C
} 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 C
} finally {
if (!success) {
try {
- IOUtils.closeSafely(true, output);
+ IOUtils.closeWhileHandlingException(output);
} catch (IOException e) {
// cannot happen since we suppress exceptions
throw new RuntimeException(e);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java Sat Aug 27 16:25:46 2011
@@ -541,7 +541,7 @@ public class TestTermVectors extends Luc
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 Luc
writer.close();
verifyIndex(target);
- IOUtils.closeSafely(false, target, input[0], input[1]);
+ IOUtils.close(target, input[0], input[1]);
}
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestIOUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestIOUtils.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestIOUtils.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestIOUtils.java Sat Aug 27 16:25:46 2011
@@ -59,7 +59,7 @@ public class TestIOUtils extends LuceneT
// 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 LuceneT
// 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) {
Modified: lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java (original)
+++ lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java Sat Aug 27 16:25:46 2011
@@ -99,7 +99,7 @@ public class TestMultipleCategoryLists e
searcher.close();
iw.close();
tw.close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
}
@Test
@@ -140,7 +140,7 @@ public class TestMultipleCategoryLists e
searcher.close();
iw.close();
tw.close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
}
@Test
@@ -184,7 +184,7 @@ public class TestMultipleCategoryLists e
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 e
searcher.close();
iw.close();
tw.close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
}
@Test
@@ -275,7 +275,7 @@ public class TestMultipleCategoryLists e
searcher.close();
iw.close();
tw.close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
}
private Directory[][] getDirs() throws IOException {
Modified: lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java (original)
+++ lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java Sat Aug 27 16:25:46 2011
@@ -109,7 +109,7 @@ public class TestTotalFacetCounts extend
++partition;
}
readers[0].close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
tmpFile.delete();
}
Modified: lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java (original)
+++ lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java Sat Aug 27 16:25:46 2011
@@ -339,7 +339,7 @@ public class TestTotalFacetCountsCache e
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 e
outputFile.delete();
writers[0].close();
readers[0].close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
}
/**
@@ -535,7 +535,7 @@ public class TestTotalFacetCountsCache e
readers[0].close();
readers[1].close();
for (Directory[] dirset : dirs) {
- IOUtils.closeSafely(false, dirset);
+ IOUtils.close(dirset);
}
}
Modified: lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java (original)
+++ lucene/dev/trunk/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java Sat Aug 27 16:25:46 2011
@@ -247,8 +247,8 @@ public class TestAddTaxonomies extends L
}
main.close();
- IOUtils.closeSafely(false, dirs);
- IOUtils.closeSafely(false, copydirs);
+ IOUtils.close(dirs);
+ IOUtils.close(copydirs);
}
}
Modified: lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTLookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTLookup.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTLookup.java (original)
+++ lucene/dev/trunk/modules/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTLookup.java Sat Aug 27 16:25:46 2011
@@ -515,7 +515,7 @@ public class FSTLookup extends Lookup {
this.automaton = new FST<Object>(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;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1162394&r1=1162393&r2=1162394&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Sat Aug 27 16:25:46 2011
@@ -247,7 +247,7 @@ public class CoreAdminHandler extends Re
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();