API: Lucene.Net.Util.IOUtils: Renamed Close() > Dispose(), CloseWhileHandlingException() > DisposeWhileHandlingException()
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/7842db8a Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/7842db8a Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/7842db8a Branch: refs/heads/master Commit: 7842db8aac18f88649bb951cc1e220140094996b Parents: 8d6fb69 Author: Shad Storhaug <[email protected]> Authored: Sat Jun 17 15:36:01 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Wed Jun 21 17:18:54 2017 +0700 ---------------------------------------------------------------------- ...HyphenationCompoundWordTokenFilterFactory.cs | 2 +- .../Hunspell/HunspellStemFilterFactory.cs | 4 +- .../Analysis/Synonym/SynonymMap.cs | 2 +- .../Analysis/Util/StopwordAnalyzerBase.cs | 6 +- .../Analysis/Util/WordlistLoader.cs | 8 +- .../SimpleNaiveBayesClassifier.cs | 2 +- .../BlockTerms/BlockTermsWriter.cs | 4 +- .../BlockTerms/FixedGapTermsIndexReader.cs | 2 +- .../BlockTerms/FixedGapTermsIndexWriter.cs | 6 +- .../BlockTerms/VariableGapTermsIndexWriter.cs | 2 +- .../Bloom/BloomFilteringPostingsFormat.cs | 6 +- .../Memory/DirectDocValuesConsumer.cs | 6 +- .../Memory/DirectDocValuesProducer.cs | 6 +- .../Memory/FSTOrdPostingsFormat.cs | 4 +- .../Memory/FSTOrdPulsing41PostingsFormat.cs | 4 +- .../Memory/FSTOrdTermsReader.cs | 6 +- .../Memory/FSTOrdTermsWriter.cs | 4 +- .../Memory/FSTPostingsFormat.cs | 4 +- .../Memory/FSTPulsing41PostingsFormat.cs | 4 +- src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs | 6 +- src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs | 4 +- .../Memory/MemoryDocValuesConsumer.cs | 6 +- .../Memory/MemoryDocValuesProducer.cs | 6 +- .../Memory/MemoryPostingsFormat.cs | 2 +- .../Pulsing/PulsingPostingsFormat.cs | 4 +- .../Pulsing/PulsingPostingsReader.cs | 2 +- .../Pulsing/PulsingPostingsWriter.cs | 2 +- src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs | 2 +- src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs | 4 +- .../SimpleText/SimpleTextDocValuesWriter.cs | 4 +- .../SimpleText/SimpleTextFieldInfosReader.cs | 2 +- .../SimpleText/SimpleTextFieldInfosWriter.cs | 2 +- .../SimpleText/SimpleTextFieldsReader.cs | 2 +- .../SimpleText/SimpleTextLiveDocsFormat.cs | 8 +- .../SimpleText/SimpleTextSegmentInfoReader.cs | 2 +- .../SimpleText/SimpleTextSegmentInfoWriter.cs | 2 +- .../SimpleText/SimpleTextStoredFieldsReader.cs | 2 +- .../SimpleText/SimpleTextStoredFieldsWriter.cs | 2 +- .../SimpleText/SimpleTextTermVectorsReader.cs | 2 +- .../SimpleText/SimpleTextTermVectorsWriter.cs | 2 +- .../Directory/DirectoryTaxonomyReader.cs | 2 +- .../Taxonomy/SearcherTaxonomyManager.cs | 2 +- .../Highlight/WeightedSpanTermExtractor.cs | 4 +- src/Lucene.Net.Misc/Index/PKIndexSplitter.cs | 8 +- src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 2 +- .../Analyzing/AnalyzingQueryParser.cs | 2 +- .../Classic/QueryParserBase.cs | 2 +- .../Processors/AnalyzerQueryNodeProcessor.cs | 2 +- .../Xml/Builders/LikeThisQueryBuilder.cs | 2 +- .../Xml/Builders/SpanOrTermsBuilder.cs | 2 +- .../Xml/Builders/TermsFilterBuilder.cs | 2 +- .../Xml/Builders/TermsQueryBuilder.cs | 2 +- .../Queries/FuzzyLikeThisQuery.cs | 2 +- .../Spell/PlainTextDictionary.cs | 4 +- .../Analyzing/AnalyzingInfixSuggester.cs | 8 +- .../Suggest/Analyzing/AnalyzingSuggester.cs | 8 +- .../Suggest/Analyzing/FreeTextSuggester.cs | 6 +- .../Suggest/FileDictionary.cs | 4 +- .../Suggest/Fst/ExternalRefSorter.cs | 4 +- .../Suggest/Fst/FSTCompletionLookup.cs | 4 +- src/Lucene.Net.Suggest/Suggest/Lookup.cs | 4 +- .../Suggest/SortedInputIterator.cs | 6 +- .../Suggest/SortedTermFreqIteratorWrapper.cs | 6 +- .../Analysis/BaseTokenStreamTestCase.cs | 6 +- .../Lucene3x/PreFlexRWFieldInfosWriter.cs | 2 +- .../Codecs/Lucene3x/PreFlexRWFieldsWriter.cs | 6 +- .../Codecs/Lucene3x/PreFlexRWNormsConsumer.cs | 4 +- .../Lucene3x/PreFlexRWStoredFieldsWriter.cs | 2 +- .../Lucene3x/PreFlexRWTermVectorsWriter.cs | 2 +- .../Codecs/Lucene3x/TermInfosWriter.cs | 4 +- .../Codecs/Lucene40/Lucene40DocValuesWriter.cs | 20 ++-- .../Codecs/Lucene40/Lucene40FieldInfosWriter.cs | 2 +- .../Codecs/Lucene40/Lucene40PostingsWriter.cs | 2 +- .../Lucene42/Lucene42DocValuesConsumer.cs | 6 +- .../Codecs/Lucene42/Lucene42FieldInfosWriter.cs | 2 +- .../MockFixedIntBlockPostingsFormat.cs | 2 +- .../MockVariableIntBlockPostingsFormat.cs | 2 +- .../Codecs/MockSep/MockSingleIntIndexOutput.cs | 2 +- .../NestedPulsingPostingsFormat.cs | 4 +- .../Codecs/RAMOnly/RAMOnlyPostingsFormat.cs | 8 +- .../Analysis/Core/TestKeywordAnalyzer.cs | 2 +- .../Analysis/Core/TestStopAnalyzer.cs | 6 +- .../Analysis/Hunspell/StemmerTestBase.cs | 4 +- .../Analysis/Hunspell/TestHunspellStemFilter.cs | 4 +- .../TestPerFieldAnalyzerWrapper.cs | 4 +- .../Shingle/ShingleAnalyzerWrapperTest.cs | 4 +- .../Analysis/Util/TestCharTokenizers.cs | 4 +- .../Util/TestFilesystemResourceLoader.cs | 4 +- .../Range/TestRangeFacetCounts.cs | 16 +-- .../SortedSet/TestSortedSetDocValuesFacets.cs | 6 +- .../Taxonomy/Directory/TestAddTaxonomy.cs | 10 +- .../Directory/TestConcurrentFacetedIndexing.cs | 2 +- .../Directory/TestDirectoryTaxonomyReader.cs | 4 +- .../Directory/TestDirectoryTaxonomyWriter.cs | 6 +- .../Taxonomy/TestCachedOrdinalsReader.cs | 2 +- .../Taxonomy/TestSearcherTaxonomyManager.cs | 8 +- .../Taxonomy/TestTaxonomyFacetAssociations.cs | 6 +- .../Taxonomy/TestTaxonomyFacetCounts.cs | 34 +++--- .../Taxonomy/TestTaxonomyFacetCounts2.cs | 12 +- .../Taxonomy/TestTaxonomyFacetSumValueSource.cs | 16 +-- .../TestDrillDownQuery.cs | 2 +- src/Lucene.Net.Tests.Facet/TestDrillSideways.cs | 10 +- src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs | 6 +- .../TestMultipleIndexFields.cs | 12 +- .../TestRandomSamplingFacetsCollector.cs | 4 +- .../VectorHighlight/AbstractTestCase.cs | 2 +- .../Index/Memory/MemoryIndexTest.cs | 4 +- .../Classic/TestMultiFieldQueryParser.cs | 2 +- .../Flexible/Standard/TestMultiFieldQPHelper.cs | 2 +- src/Lucene.Net.Tests.Spatial/SpatialTestCase.cs | 4 +- .../Analyzing/AnalyzingInfixSuggesterTest.cs | 2 +- .../Analysis/TestMockAnalyzer.cs | 4 +- .../Codecs/Lucene40/TestReuseDocsEnum.cs | 6 +- src/Lucene.Net.Tests/Index/TestAddIndexes.cs | 2 +- .../Index/TestAllFilesHaveChecksumFooter.cs | 4 +- .../Index/TestAllFilesHaveCodecHeader.cs | 4 +- .../Index/TestBinaryDocValuesUpdates.cs | 8 +- src/Lucene.Net.Tests/Index/TestCompoundFile.cs | 4 +- src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 8 +- src/Lucene.Net.Tests/Index/TestLongPostings.cs | 2 +- .../Index/TestMixedDocValuesUpdates.cs | 2 +- .../Index/TestNumericDocValuesUpdates.cs | 6 +- .../Index/TestPostingsOffsets.cs | 4 +- .../Index/TestTermVectorsWriter.cs | 2 +- .../Search/TestCachingWrapperFilter.cs | 2 +- .../TestControlledRealTimeReopenThread.cs | 2 +- .../Search/TestFilteredQuery.cs | 4 +- .../Search/TestIndexSearcher.cs | 2 +- src/Lucene.Net.Tests/Search/TestPhraseQuery.cs | 2 +- src/Lucene.Net.Tests/Search/TestTermVectors.cs | 4 +- src/Lucene.Net.Tests/Util/TestIOUtils.cs | 4 +- src/Lucene.Net/Codecs/BlockTreeTermsReader.cs | 4 +- src/Lucene.Net/Codecs/BlockTreeTermsWriter.cs | 4 +- .../CompressingStoredFieldsReader.cs | 4 +- .../CompressingStoredFieldsWriter.cs | 6 +- .../Compressing/CompressingTermVectorsReader.cs | 4 +- .../Compressing/CompressingTermVectorsWriter.cs | 6 +- .../Codecs/Lucene3x/Lucene3xFieldInfosReader.cs | 2 +- .../Codecs/Lucene3x/Lucene3xFields.cs | 2 +- .../Codecs/Lucene3x/Lucene3xNormsProducer.cs | 4 +- .../Lucene3x/Lucene3xSegmentInfoReader.cs | 2 +- .../Lucene3x/Lucene3xStoredFieldsReader.cs | 2 +- .../Lucene3x/Lucene3xTermVectorsReader.cs | 2 +- .../Codecs/Lucene3x/TermInfosReader.cs | 2 +- src/Lucene.Net/Codecs/Lucene40/BitVector.cs | 2 +- .../Codecs/Lucene40/Lucene40DocValuesReader.cs | 24 ++-- .../Codecs/Lucene40/Lucene40FieldInfosReader.cs | 2 +- .../Codecs/Lucene40/Lucene40PostingsReader.cs | 2 +- .../Lucene40/Lucene40SegmentInfoReader.cs | 2 +- .../Lucene40/Lucene40SegmentInfoWriter.cs | 2 +- .../Lucene40/Lucene40StoredFieldsReader.cs | 2 +- .../Lucene40/Lucene40StoredFieldsWriter.cs | 2 +- .../Lucene40/Lucene40TermVectorsReader.cs | 2 +- .../Lucene40/Lucene40TermVectorsWriter.cs | 2 +- .../Codecs/Lucene41/Lucene41PostingsFormat.cs | 4 +- .../Codecs/Lucene41/Lucene41PostingsReader.cs | 4 +- .../Codecs/Lucene41/Lucene41PostingsWriter.cs | 6 +- .../Lucene42/Lucene42DocValuesProducer.cs | 6 +- .../Codecs/Lucene42/Lucene42FieldInfosReader.cs | 2 +- .../Codecs/Lucene42/Lucene42NormsConsumer.cs | 6 +- .../Lucene45/Lucene45DocValuesConsumer.cs | 6 +- .../Lucene45/Lucene45DocValuesProducer.cs | 6 +- .../Codecs/Lucene46/Lucene46FieldInfosReader.cs | 2 +- .../Codecs/Lucene46/Lucene46FieldInfosWriter.cs | 2 +- .../Lucene46/Lucene46SegmentInfoReader.cs | 2 +- .../Lucene46/Lucene46SegmentInfoWriter.cs | 2 +- .../Codecs/PerField/PerFieldDocValuesFormat.cs | 6 +- .../Codecs/PerField/PerFieldPostingsFormat.cs | 6 +- src/Lucene.Net/Index/DocInverterPerField.cs | 2 +- src/Lucene.Net/Index/DocValuesProcessor.cs | 4 +- src/Lucene.Net/Index/FreqProxTermsWriter.cs | 4 +- src/Lucene.Net/Index/IndexWriter.cs | 22 ++-- src/Lucene.Net/Index/NormsConsumer.cs | 4 +- .../Index/PersistentSnapshotDeletionPolicy.cs | 4 +- src/Lucene.Net/Index/ReadersAndUpdates.cs | 2 +- src/Lucene.Net/Index/SegmentCoreReaders.cs | 2 +- src/Lucene.Net/Index/SegmentInfos.cs | 10 +- src/Lucene.Net/Index/SegmentMerger.cs | 12 +- src/Lucene.Net/Index/SegmentReader.cs | 2 +- src/Lucene.Net/Index/StandardDirectoryReader.cs | 2 +- src/Lucene.Net/Index/StoredFieldsProcessor.cs | 4 +- src/Lucene.Net/Index/TermVectorsConsumer.cs | 2 +- .../Search/SearcherLifetimeManager.cs | 2 +- src/Lucene.Net/Store/CompoundFileDirectory.cs | 6 +- src/Lucene.Net/Store/CompoundFileWriter.cs | 10 +- src/Lucene.Net/Store/Directory.cs | 2 +- src/Lucene.Net/Store/FSDirectory.cs | 2 +- src/Lucene.Net/Store/LockVerifyServer.cs | 2 +- src/Lucene.Net/Store/NRTCachingDirectory.cs | 2 +- src/Lucene.Net/Store/NativeFSLockFactory.cs | 4 +- src/Lucene.Net/Util/Fst/FST.cs | 8 +- src/Lucene.Net/Util/IOUtils.cs | 116 ++++++++++++++++--- src/Lucene.Net/Util/OfflineSorter.cs | 8 +- src/Lucene.Net/Util/QueryBuilder.cs | 2 +- 194 files changed, 535 insertions(+), 445 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs index 8c53368..5624b0d 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs @@ -105,7 +105,7 @@ namespace Lucene.Net.Analysis.Compound } finally { - IOUtils.CloseWhileHandlingException(stream); + IOUtils.DisposeWhileHandlingException(stream); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs index 93734b5..d27fa3b 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs @@ -98,8 +98,8 @@ namespace Lucene.Net.Analysis.Hunspell } finally { - IOUtils.CloseWhileHandlingException(affix); - IOUtils.CloseWhileHandlingException(dictionaries); + IOUtils.DisposeWhileHandlingException(affix); + IOUtils.DisposeWhileHandlingException(dictionaries); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs index 9184a19..16f0ea0 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs @@ -396,7 +396,7 @@ namespace Lucene.Net.Analysis.Synonym } finally { - IOUtils.CloseWhileHandlingException(priorException, ts); + IOUtils.DisposeWhileHandlingException(priorException, ts); } if (reuse.Length == 0) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs index 29ea3e2..8bb3f0b 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs @@ -105,7 +105,7 @@ namespace Lucene.Net.Analysis.Util } finally { - IOUtils.Close(reader); + IOUtils.Dispose(reader); } } @@ -131,7 +131,7 @@ namespace Lucene.Net.Analysis.Util } finally { - IOUtils.Close(reader); + IOUtils.Dispose(reader); } } @@ -155,7 +155,7 @@ namespace Lucene.Net.Analysis.Util } finally { - IOUtils.Close(stopwords); + IOUtils.Dispose(stopwords); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs index 631879d..23fa016 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs @@ -64,7 +64,7 @@ namespace Lucene.Net.Analysis.Util } finally { - IOUtils.Close(reader); + IOUtils.Dispose(reader); } return result; } @@ -123,7 +123,7 @@ namespace Lucene.Net.Analysis.Util } finally { - IOUtils.Close(reader); + IOUtils.Dispose(reader); } return result; } @@ -167,7 +167,7 @@ namespace Lucene.Net.Analysis.Util } finally { - IOUtils.Close(reader); + IOUtils.Dispose(reader); } return result; } @@ -212,7 +212,7 @@ namespace Lucene.Net.Analysis.Util } finally { - IOUtils.Close(reader); + IOUtils.Dispose(reader); } return result; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs b/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs index 638c428..b0b1de4 100644 --- a/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs +++ b/src/Lucene.Net.Classification/SimpleNaiveBayesClassifier.cs @@ -125,7 +125,7 @@ namespace Lucene.Net.Classification } finally { - IOUtils.CloseWhileHandlingException(tokenStream); + IOUtils.DisposeWhileHandlingException(tokenStream); } } var ret = new string[result.Count]; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs index 149a8f7..de61035 100644 --- a/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs +++ b/src/Lucene.Net.Codecs/BlockTerms/BlockTermsWriter.cs @@ -110,7 +110,7 @@ namespace Lucene.Net.Codecs.BlockTerms { if (!success) { - IOUtils.CloseWhileHandlingException(m_output); + IOUtils.DisposeWhileHandlingException(m_output); } } } @@ -161,7 +161,7 @@ namespace Lucene.Net.Codecs.BlockTerms } finally { - IOUtils.Close(m_output, postingsWriter, termsIndexWriter); + IOUtils.Dispose(m_output, postingsWriter, termsIndexWriter); m_output = null; } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs index 1891d3b..35b721e 100644 --- a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs +++ b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexReader.cs @@ -142,7 +142,7 @@ namespace Lucene.Net.Codecs.BlockTerms { if (!success) { - IOUtils.CloseWhileHandlingException(input); + IOUtils.DisposeWhileHandlingException(input); } if (indexDivisor > 0) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs index 41ed974..44ca474 100644 --- a/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs +++ b/src/Lucene.Net.Codecs/BlockTerms/FixedGapTermsIndexWriter.cs @@ -69,7 +69,7 @@ namespace Lucene.Net.Codecs.BlockTerms { if (!success) { - IOUtils.CloseWhileHandlingException(m_output); + IOUtils.DisposeWhileHandlingException(m_output); } } } @@ -274,11 +274,11 @@ namespace Lucene.Net.Codecs.BlockTerms { if (success) { - IOUtils.Close(m_output); + IOUtils.Dispose(m_output); } else { - IOUtils.CloseWhileHandlingException(m_output); + IOUtils.DisposeWhileHandlingException(m_output); } m_output = null; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs b/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs index 47a46cc..bdb9609 100644 --- a/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs +++ b/src/Lucene.Net.Codecs/BlockTerms/VariableGapTermsIndexWriter.cs @@ -196,7 +196,7 @@ namespace Lucene.Net.Codecs.BlockTerms { if (!success) { - IOUtils.CloseWhileHandlingException(m_output); + IOUtils.DisposeWhileHandlingException(m_output); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs index cf0ca01..cc2c248 100644 --- a/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Bloom/BloomFilteringPostingsFormat.cs @@ -168,14 +168,14 @@ namespace Lucene.Net.Codecs.Bloom #pragma warning restore 612, 618 } - IOUtils.Close(bloomIn); + IOUtils.Dispose(bloomIn); success = true; } finally { if (!success) { - IOUtils.CloseWhileHandlingException(bloomIn, _delegateFieldsProducer); + IOUtils.DisposeWhileHandlingException(bloomIn, _delegateFieldsProducer); } } } @@ -482,7 +482,7 @@ namespace Lucene.Net.Codecs.Bloom } finally { - IOUtils.Close(bloomOutput); + IOUtils.Dispose(bloomOutput); } //We are done with large bitsets so no need to keep them hanging around _bloomFilters.Clear(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs b/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs index ca2c405..4877481 100644 --- a/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs +++ b/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs @@ -58,7 +58,7 @@ namespace Lucene.Net.Codecs.Memory { if (!success) { - IOUtils.CloseWhileHandlingException(this); + IOUtils.DisposeWhileHandlingException(this); } } } @@ -174,11 +174,11 @@ namespace Lucene.Net.Codecs.Memory { if (success) { - IOUtils.Close(data, meta); + IOUtils.Dispose(data, meta); } else { - IOUtils.CloseWhileHandlingException(data, meta); + IOUtils.DisposeWhileHandlingException(data, meta); } data = meta = null; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs b/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs index fe4c95a..317c5c3 100644 --- a/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs +++ b/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs @@ -86,11 +86,11 @@ namespace Lucene.Net.Codecs.Memory { if (success) { - IOUtils.Close(@in); + IOUtils.Dispose(@in); } else { - IOUtils.CloseWhileHandlingException(@in); + IOUtils.DisposeWhileHandlingException(@in); } } @@ -111,7 +111,7 @@ namespace Lucene.Net.Codecs.Memory { if (!success) { - IOUtils.CloseWhileHandlingException(this.data); + IOUtils.DisposeWhileHandlingException(this.data); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs index 0fa8f2a..bb35701 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs @@ -54,7 +54,7 @@ { if (!success) { - IOUtils.CloseWhileHandlingException(postingsWriter); + IOUtils.DisposeWhileHandlingException(postingsWriter); } } } @@ -74,7 +74,7 @@ { if (!success) { - IOUtils.CloseWhileHandlingException(postingsReader); + IOUtils.DisposeWhileHandlingException(postingsReader); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs index 01826bb..77afc20 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs @@ -65,7 +65,7 @@ { if (!success) { - IOUtils.CloseWhileHandlingException(docsWriter, pulsingWriter); + IOUtils.DisposeWhileHandlingException(docsWriter, pulsingWriter); } } } @@ -87,7 +87,7 @@ { if (!success) { - IOUtils.CloseWhileHandlingException(docsReader, pulsingReader); + IOUtils.DisposeWhileHandlingException(docsReader, pulsingReader); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs index 84ad53c..2f68422 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs @@ -107,11 +107,11 @@ namespace Lucene.Net.Codecs.Memory { if (success) { - IOUtils.Close(indexIn, blockIn); + IOUtils.Dispose(indexIn, blockIn); } else { - IOUtils.CloseWhileHandlingException(indexIn, blockIn); + IOUtils.DisposeWhileHandlingException(indexIn, blockIn); } } } @@ -186,7 +186,7 @@ namespace Lucene.Net.Codecs.Memory { try { - IOUtils.Close(postingsReader); + IOUtils.Dispose(postingsReader); } finally { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs index 888cb12..859c579 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs @@ -177,7 +177,7 @@ namespace Lucene.Net.Codecs.Memory { if (!success) { - IOUtils.CloseWhileHandlingException(indexOut, blockOut); + IOUtils.DisposeWhileHandlingException(indexOut, blockOut); } } } @@ -231,7 +231,7 @@ namespace Lucene.Net.Codecs.Memory } finally { - IOUtils.CloseWhileHandlingException(ioe, blockOut, indexOut, postingsWriter); + IOUtils.DisposeWhileHandlingException(ioe, blockOut, indexOut, postingsWriter); blockOut = null; } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs index b792653..055e219 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs @@ -54,7 +54,7 @@ { if (!success) { - IOUtils.CloseWhileHandlingException(postingsWriter); + IOUtils.DisposeWhileHandlingException(postingsWriter); } } } @@ -74,7 +74,7 @@ { if (!success) { - IOUtils.CloseWhileHandlingException(postingsReader); + IOUtils.DisposeWhileHandlingException(postingsReader); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs index 839588a..c4790b0 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs @@ -66,7 +66,7 @@ { if (!success) { - IOUtils.CloseWhileHandlingException(docsWriter, pulsingWriter); + IOUtils.DisposeWhileHandlingException(docsWriter, pulsingWriter); } } } @@ -88,7 +88,7 @@ { if (!success) { - IOUtils.CloseWhileHandlingException(docsReader, pulsingReader); + IOUtils.DisposeWhileHandlingException(docsReader, pulsingReader); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs index 6a19546..4caf087 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs @@ -107,11 +107,11 @@ namespace Lucene.Net.Codecs.Memory { if (success) { - IOUtils.Close(@in); + IOUtils.Dispose(@in); } else { - IOUtils.CloseWhileHandlingException(@in); + IOUtils.DisposeWhileHandlingException(@in); } } } @@ -182,7 +182,7 @@ namespace Lucene.Net.Codecs.Memory { try { - IOUtils.Close(postingsReader); + IOUtils.Dispose(postingsReader); } finally { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs b/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs index 8077e37..7e76b93 100644 --- a/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs +++ b/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs @@ -145,7 +145,7 @@ namespace Lucene.Net.Codecs.Memory { if (!success) { - IOUtils.CloseWhileHandlingException(_output); + IOUtils.DisposeWhileHandlingException(_output); } } } @@ -200,7 +200,7 @@ namespace Lucene.Net.Codecs.Memory } finally { - IOUtils.CloseWhileHandlingException(ioe, _output, _postingsWriter); + IOUtils.DisposeWhileHandlingException(ioe, _output, _postingsWriter); _output = null; } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs index 4aef40c..8bbb765 100644 --- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs +++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs @@ -72,7 +72,7 @@ namespace Lucene.Net.Codecs.Memory { if (!success) { - IOUtils.CloseWhileHandlingException(this); + IOUtils.DisposeWhileHandlingException(this); } } } @@ -253,11 +253,11 @@ namespace Lucene.Net.Codecs.Memory { if (success) { - IOUtils.Close(data, meta); + IOUtils.Dispose(data, meta); } else { - IOUtils.CloseWhileHandlingException(data, meta); + IOUtils.DisposeWhileHandlingException(data, meta); } data = meta = null; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs index 9e32c5a..c1fafaa 100644 --- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs +++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs @@ -100,11 +100,11 @@ namespace Lucene.Net.Codecs.Memory { if (success) { - IOUtils.Close(@in); + IOUtils.Dispose(@in); } else { - IOUtils.CloseWhileHandlingException(@in); + IOUtils.DisposeWhileHandlingException(@in); } } @@ -127,7 +127,7 @@ namespace Lucene.Net.Codecs.Memory { if (!success) { - IOUtils.CloseWhileHandlingException(this.data); + IOUtils.DisposeWhileHandlingException(this.data); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs index eba1941..0786f5d 100644 --- a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs @@ -333,7 +333,7 @@ namespace Lucene.Net.Codecs.Memory { if (!success) { - IOUtils.CloseWhileHandlingException(@out); + IOUtils.DisposeWhileHandlingException(@out); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsFormat.cs b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsFormat.cs index 550c422..49cb9c1 100644 --- a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsFormat.cs +++ b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsFormat.cs @@ -84,7 +84,7 @@ namespace Lucene.Net.Codecs.Pulsing { if (!success) { - IOUtils.CloseWhileHandlingException(docsWriter, pulsingWriter); + IOUtils.DisposeWhileHandlingException(docsWriter, pulsingWriter); } } } @@ -112,7 +112,7 @@ namespace Lucene.Net.Codecs.Pulsing { if (!success) { - IOUtils.CloseWhileHandlingException(docsReader, pulsingReader); + IOUtils.DisposeWhileHandlingException(docsReader, pulsingReader); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs index 9b3627d..38cbc19 100644 --- a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs +++ b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsReader.cs @@ -88,7 +88,7 @@ namespace Lucene.Net.Codecs.Pulsing } finally { - IOUtils.CloseWhileHandlingException(input); + IOUtils.DisposeWhileHandlingException(input); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs index c515426..38034f7 100644 --- a/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs +++ b/src/Lucene.Net.Codecs/Pulsing/PulsingPostingsWriter.cs @@ -459,7 +459,7 @@ namespace Lucene.Net.Codecs.Pulsing } finally { - IOUtils.CloseWhileHandlingException(output); + IOUtils.DisposeWhileHandlingException(output); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs index 90fb85e..b929d0c 100644 --- a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs +++ b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs @@ -98,7 +98,7 @@ namespace Lucene.Net.Codecs.Sep { if (disposing) { - IOUtils.Close(freqIn, docIn, skipIn, posIn, payloadIn); + IOUtils.Dispose(freqIn, docIn, skipIn, posIn, payloadIn); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs b/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs index 9a1e895..530a8eb 100644 --- a/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs +++ b/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs @@ -152,7 +152,7 @@ namespace Lucene.Net.Codecs.Sep { if (!success) { - IOUtils.CloseWhileHandlingException(docOut, skipOut, freqOut, posOut, payloadOut); + IOUtils.DisposeWhileHandlingException(docOut, skipOut, freqOut, posOut, payloadOut); } } } @@ -408,7 +408,7 @@ namespace Lucene.Net.Codecs.Sep { if (disposing) { - IOUtils.Close(docOut, skipOut, freqOut, posOut, payloadOut); + IOUtils.Dispose(docOut, skipOut, freqOut, posOut, payloadOut); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs index 1a01db9..3598d6a 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs @@ -435,11 +435,11 @@ namespace Lucene.Net.Codecs.SimpleText { if (success) { - IOUtils.Close(data); + IOUtils.Dispose(data); } else { - IOUtils.CloseWhileHandlingException(data); + IOUtils.DisposeWhileHandlingException(data); } data = null; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs index a53519a..dc74dbf 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosReader.cs @@ -153,7 +153,7 @@ namespace Lucene.Net.Codecs.SimpleText } else { - IOUtils.CloseWhileHandlingException(input); + IOUtils.DisposeWhileHandlingException(input); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosWriter.cs index 4e3eee1..82735dc 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosWriter.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldInfosWriter.cs @@ -152,7 +152,7 @@ namespace Lucene.Net.Codecs.SimpleText } else { - IOUtils.CloseWhileHandlingException(output); + IOUtils.DisposeWhileHandlingException(output); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs index a7c33f8..a2de3ee 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextFieldsReader.cs @@ -76,7 +76,7 @@ namespace Lucene.Net.Codecs.SimpleText { if (!success) { - IOUtils.CloseWhileHandlingException(); + IOUtils.DisposeWhileHandlingException(); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextLiveDocsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextLiveDocsFormat.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextLiveDocsFormat.cs index ef1c6d2..3b32d74 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextLiveDocsFormat.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextLiveDocsFormat.cs @@ -103,11 +103,11 @@ namespace Lucene.Net.Codecs.SimpleText { if (success) { - IOUtils.Close(input); + IOUtils.Dispose(input); } else { - IOUtils.CloseWhileHandlingException(input); + IOUtils.DisposeWhileHandlingException(input); } } } @@ -154,11 +154,11 @@ namespace Lucene.Net.Codecs.SimpleText { if (success) { - IOUtils.Close(output); + IOUtils.Dispose(output); } else { - IOUtils.CloseWhileHandlingException(output); + IOUtils.DisposeWhileHandlingException(output); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoReader.cs index 6e7a072..2cb7884 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoReader.cs @@ -104,7 +104,7 @@ namespace Lucene.Net.Codecs.SimpleText { if (!success) { - IOUtils.CloseWhileHandlingException(input); + IOUtils.DisposeWhileHandlingException(input); } else { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoWriter.cs index e966a7c..d83b672 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoWriter.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextSegmentInfoWriter.cs @@ -114,7 +114,7 @@ namespace Lucene.Net.Codecs.SimpleText { if (!success) { - IOUtils.CloseWhileHandlingException(output); + IOUtils.DisposeWhileHandlingException(output); try { dir.DeleteFile(segFileName); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs index 9131d31..03a0b51 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsReader.cs @@ -235,7 +235,7 @@ namespace Lucene.Net.Codecs.SimpleText try { - IOUtils.Close(_input); + IOUtils.Dispose(_input); } finally { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs index ae67cc3..92d68ce 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextStoredFieldsWriter.cs @@ -214,7 +214,7 @@ namespace Lucene.Net.Codecs.SimpleText if (!disposing) return; try { - IOUtils.Close(_output); + IOUtils.Dispose(_output); } finally { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs index a4d7fc5..a3018de 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsReader.cs @@ -244,7 +244,7 @@ namespace Lucene.Net.Codecs.SimpleText try { - IOUtils.Close(_input); + IOUtils.Dispose(_input); } finally { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsWriter.cs index c376c46..869eda0 100644 --- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsWriter.cs +++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextTermVectorsWriter.cs @@ -207,7 +207,7 @@ namespace Lucene.Net.Codecs.SimpleText try { - IOUtils.Close(_output); + IOUtils.Dispose(_output); } finally { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs index b66517e..9b0f8e7 100644 --- a/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs +++ b/src/Lucene.Net.Facet/Taxonomy/Directory/DirectoryTaxonomyReader.cs @@ -228,7 +228,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory { if (!success) { - IOUtils.CloseWhileHandlingException(r2); + IOUtils.DisposeWhileHandlingException(r2); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs b/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs index 24ca87b..1427f15 100644 --- a/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs +++ b/src/Lucene.Net.Facet/Taxonomy/SearcherTaxonomyManager.cs @@ -165,7 +165,7 @@ namespace Lucene.Net.Facet.Taxonomy } else if (taxoWriter != null && taxoWriter.TaxonomyEpoch != taxoEpoch) { - IOUtils.Close(newReader, tr); + IOUtils.Dispose(newReader, tr); throw new InvalidOperationException("DirectoryTaxonomyWriter.replaceTaxonomy was called, which is not allowed when using SearcherTaxonomyManager"); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs b/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs index 029c047..25b2cbe 100644 --- a/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs +++ b/src/Lucene.Net.Highlighter/Highlight/WeightedSpanTermExtractor.cs @@ -502,7 +502,7 @@ namespace Lucene.Net.Search.Highlight } finally { - IOUtils.Close(internalReader); + IOUtils.Dispose(internalReader); } return terms; @@ -545,7 +545,7 @@ namespace Lucene.Net.Search.Highlight } finally { - IOUtils.Close(internalReader); + IOUtils.Dispose(internalReader); } return terms; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Misc/Index/PKIndexSplitter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Misc/Index/PKIndexSplitter.cs b/src/Lucene.Net.Misc/Index/PKIndexSplitter.cs index 0196d11..aa4ac7b 100644 --- a/src/Lucene.Net.Misc/Index/PKIndexSplitter.cs +++ b/src/Lucene.Net.Misc/Index/PKIndexSplitter.cs @@ -89,11 +89,11 @@ namespace Lucene.Net.Index { if (success) { - IOUtils.Close(reader); + IOUtils.Dispose(reader); } else { - IOUtils.CloseWhileHandlingException(reader); + IOUtils.DisposeWhileHandlingException(reader); } } } @@ -118,11 +118,11 @@ namespace Lucene.Net.Index { if (success) { - IOUtils.Close(w); + IOUtils.Dispose(w); } else { - IOUtils.CloseWhileHandlingException(w); + IOUtils.DisposeWhileHandlingException(w); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs index f9effad..0d9a375 100644 --- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs +++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs @@ -619,7 +619,7 @@ namespace Lucene.Net.Queries.Mlt } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs b/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs index 25b869a..f401501 100644 --- a/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs +++ b/src/Lucene.Net.QueryParser/Analyzing/AnalyzingQueryParser.cs @@ -212,7 +212,7 @@ namespace Lucene.Net.QueryParsers.Analyzing } finally { - IOUtils.CloseWhileHandlingException(stream); + IOUtils.DisposeWhileHandlingException(stream); } return analyzed; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs b/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs index 0042a46..dcc4d64 100644 --- a/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs +++ b/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs @@ -624,7 +624,7 @@ namespace Lucene.Net.QueryParsers.Classic } finally { - IOUtils.CloseWhileHandlingException(source); + IOUtils.DisposeWhileHandlingException(source); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs index 7927210..49fdce1 100644 --- a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs +++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs @@ -155,7 +155,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors } finally { - IOUtils.CloseWhileHandlingException(source); + IOUtils.DisposeWhileHandlingException(source); } // rewind the buffer stream http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Xml/Builders/LikeThisQueryBuilder.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Xml/Builders/LikeThisQueryBuilder.cs b/src/Lucene.Net.QueryParser/Xml/Builders/LikeThisQueryBuilder.cs index 4e6a70a..0af6739 100644 --- a/src/Lucene.Net.QueryParser/Xml/Builders/LikeThisQueryBuilder.cs +++ b/src/Lucene.Net.QueryParser/Xml/Builders/LikeThisQueryBuilder.cs @@ -92,7 +92,7 @@ namespace Lucene.Net.QueryParsers.Xml.Builders } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Xml/Builders/SpanOrTermsBuilder.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Xml/Builders/SpanOrTermsBuilder.cs b/src/Lucene.Net.QueryParser/Xml/Builders/SpanOrTermsBuilder.cs index 5083797..9b6c09d 100644 --- a/src/Lucene.Net.QueryParser/Xml/Builders/SpanOrTermsBuilder.cs +++ b/src/Lucene.Net.QueryParser/Xml/Builders/SpanOrTermsBuilder.cs @@ -71,7 +71,7 @@ namespace Lucene.Net.QueryParsers.Xml.Builders } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Xml/Builders/TermsFilterBuilder.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Xml/Builders/TermsFilterBuilder.cs b/src/Lucene.Net.QueryParser/Xml/Builders/TermsFilterBuilder.cs index b081a06..0fcaf99 100644 --- a/src/Lucene.Net.QueryParser/Xml/Builders/TermsFilterBuilder.cs +++ b/src/Lucene.Net.QueryParser/Xml/Builders/TermsFilterBuilder.cs @@ -69,7 +69,7 @@ namespace Lucene.Net.QueryParsers.Xml.Builders } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } return new TermsFilter(fieldName, terms); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.QueryParser/Xml/Builders/TermsQueryBuilder.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.QueryParser/Xml/Builders/TermsQueryBuilder.cs b/src/Lucene.Net.QueryParser/Xml/Builders/TermsQueryBuilder.cs index 946496c..9a054a7 100644 --- a/src/Lucene.Net.QueryParser/Xml/Builders/TermsQueryBuilder.cs +++ b/src/Lucene.Net.QueryParser/Xml/Builders/TermsQueryBuilder.cs @@ -67,7 +67,7 @@ namespace Lucene.Net.QueryParsers.Xml.Builders } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } bq.Boost = DOMUtils.GetAttribute(e, "boost", 1.0f); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs b/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs index d866954..3cc7e2c 100644 --- a/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs +++ b/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs @@ -265,7 +265,7 @@ namespace Lucene.Net.Sandbox.Queries } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Spell/PlainTextDictionary.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Spell/PlainTextDictionary.cs b/src/Lucene.Net.Suggest/Spell/PlainTextDictionary.cs index 7250220..bac8c7a 100644 --- a/src/Lucene.Net.Suggest/Spell/PlainTextDictionary.cs +++ b/src/Lucene.Net.Suggest/Spell/PlainTextDictionary.cs @@ -102,7 +102,7 @@ namespace Lucene.Net.Search.Spell else { done = true; - IOUtils.Close(outerInstance.@in); + IOUtils.Dispose(outerInstance.@in); result = null; } success = true; @@ -111,7 +111,7 @@ namespace Lucene.Net.Search.Spell { if (!success) { - IOUtils.CloseWhileHandlingException(outerInstance.@in); + IOUtils.DisposeWhileHandlingException(outerInstance.@in); } } return result; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs index edd912e..bbe19fb 100644 --- a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs +++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingInfixSuggester.cs @@ -236,11 +236,11 @@ namespace Lucene.Net.Search.Suggest.Analyzing { if (success) { - IOUtils.Close(r); + IOUtils.Dispose(r); } else { - IOUtils.CloseWhileHandlingException(writer, r); + IOUtils.DisposeWhileHandlingException(writer, r); writer = null; } } @@ -499,7 +499,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } // TODO: we could allow blended sort here, combining @@ -674,7 +674,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs index 0f85629..6eff94b 100644 --- a/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs +++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/AnalyzingSuggester.cs @@ -609,11 +609,11 @@ namespace Lucene.Net.Search.Suggest.Analyzing { if (success) { - IOUtils.Close(reader, writer); + IOUtils.Dispose(reader, writer); } else { - IOUtils.CloseWhileHandlingException(reader, writer); + IOUtils.DisposeWhileHandlingException(reader, writer); } tempInput.Delete(); @@ -958,7 +958,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } ReplaceSep(automaton); @@ -988,7 +988,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } // TODO: we could use the end offset to "guess" http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs b/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs index aeeb8be..31b7839 100644 --- a/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs +++ b/src/Lucene.Net.Suggest/Suggest/Analyzing/FreeTextSuggester.cs @@ -415,11 +415,11 @@ namespace Lucene.Net.Search.Suggest.Analyzing { if (success) { - IOUtils.Close(writer, reader); + IOUtils.Dispose(writer, reader); } else { - IOUtils.CloseWhileHandlingException(writer, reader); + IOUtils.DisposeWhileHandlingException(writer, reader); } } finally @@ -800,7 +800,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/FileDictionary.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Suggest/FileDictionary.cs b/src/Lucene.Net.Suggest/Suggest/FileDictionary.cs index 35d6ab0..0928676 100644 --- a/src/Lucene.Net.Suggest/Suggest/FileDictionary.cs +++ b/src/Lucene.Net.Suggest/Suggest/FileDictionary.cs @@ -140,7 +140,7 @@ namespace Lucene.Net.Search.Suggest if (outerInstance.line == null) { outerInstance.done = true; - IOUtils.Close(outerInstance.@in); + IOUtils.Dispose(outerInstance.@in); } else { @@ -225,7 +225,7 @@ namespace Lucene.Net.Search.Suggest else { outerInstance.done = true; - IOUtils.Close(outerInstance.@in); + IOUtils.Dispose(outerInstance.@in); return null; } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs b/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs index d55c944..08a0737 100644 --- a/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs +++ b/src/Lucene.Net.Suggest/Suggest/Fst/ExternalRefSorter.cs @@ -140,7 +140,7 @@ namespace Lucene.Net.Search.Suggest.Fst } else { - IOUtils.Close(reader); + IOUtils.Dispose(reader); scratch = null; } success = true; @@ -150,7 +150,7 @@ namespace Lucene.Net.Search.Suggest.Fst { if (!success) { - IOUtils.CloseWhileHandlingException(reader); + IOUtils.DisposeWhileHandlingException(reader); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/Fst/FSTCompletionLookup.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Suggest/Fst/FSTCompletionLookup.cs b/src/Lucene.Net.Suggest/Suggest/Fst/FSTCompletionLookup.cs index 417b73d..ebd9094 100644 --- a/src/Lucene.Net.Suggest/Suggest/Fst/FSTCompletionLookup.cs +++ b/src/Lucene.Net.Suggest/Suggest/Fst/FSTCompletionLookup.cs @@ -226,11 +226,11 @@ namespace Lucene.Net.Search.Suggest.Fst { if (success) { - IOUtils.Close(reader, writer, sorter); + IOUtils.Dispose(reader, writer, sorter); } else { - IOUtils.CloseWhileHandlingException(reader, writer, sorter); + IOUtils.DisposeWhileHandlingException(reader, writer, sorter); } tempInput.Delete(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/Lookup.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Suggest/Lookup.cs b/src/Lucene.Net.Suggest/Suggest/Lookup.cs index d2188c1..93b55fb 100644 --- a/src/Lucene.Net.Suggest/Suggest/Lookup.cs +++ b/src/Lucene.Net.Suggest/Suggest/Lookup.cs @@ -218,7 +218,7 @@ namespace Lucene.Net.Search.Suggest } finally { - IOUtils.Close(input); + IOUtils.Dispose(input); } } @@ -235,7 +235,7 @@ namespace Lucene.Net.Search.Suggest } finally { - IOUtils.Close(output); + IOUtils.Dispose(output); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs b/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs index 19ff0b7..bfad1c6 100644 --- a/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs +++ b/src/Lucene.Net.Suggest/Suggest/SortedInputIterator.cs @@ -237,13 +237,13 @@ namespace Lucene.Net.Search.Suggest { if (success) { - IOUtils.Close(writer); + IOUtils.Dispose(writer); } else { try { - IOUtils.CloseWhileHandlingException(writer); + IOUtils.DisposeWhileHandlingException(writer); } finally { @@ -255,7 +255,7 @@ namespace Lucene.Net.Search.Suggest private void Dispose() { - IOUtils.Close(reader); + IOUtils.Dispose(reader); if (tempInput != null) { tempInput.Delete(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs b/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs index 3af48e7..7f0fc99 100644 --- a/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs +++ b/src/Lucene.Net.Suggest/Suggest/SortedTermFreqIteratorWrapper.cs @@ -172,13 +172,13 @@ namespace Lucene.Net.Search.Suggest { if (success) { - IOUtils.Close(writer); + IOUtils.Dispose(writer); } else { try { - IOUtils.CloseWhileHandlingException(writer); + IOUtils.DisposeWhileHandlingException(writer); } finally { @@ -190,7 +190,7 @@ namespace Lucene.Net.Search.Suggest private void Dispose() { - IOUtils.Close(reader); + IOUtils.Dispose(reader); if (tempInput != null) { tempInput.Delete(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs index 5c97b0d..78cdd7a 100644 --- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs +++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs @@ -725,11 +725,11 @@ namespace Lucene.Net.Analysis { if (success) { - IOUtils.Close(iw, dir); + IOUtils.Dispose(iw, dir); } else { - IOUtils.CloseWhileHandlingException(iw, dir); // checkindex + IOUtils.DisposeWhileHandlingException(iw, dir); // checkindex } } } @@ -862,7 +862,7 @@ namespace Lucene.Net.Analysis } finally { - IOUtils.CloseWhileHandlingException(docs); + IOUtils.DisposeWhileHandlingException(docs); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosWriter.cs index 6651cb2..3b4d9c3 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldInfosWriter.cs @@ -122,7 +122,7 @@ namespace Lucene.Net.Codecs.Lucene3x } else { - IOUtils.CloseWhileHandlingException(output); + IOUtils.DisposeWhileHandlingException(output); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs index ff80ffb..486c5c1 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWFieldsWriter.cs @@ -55,7 +55,7 @@ namespace Lucene.Net.Codecs.Lucene3x { if (!success) { - IOUtils.CloseWhileHandlingException(TermsOut); + IOUtils.DisposeWhileHandlingException(TermsOut); } } @@ -77,7 +77,7 @@ namespace Lucene.Net.Codecs.Lucene3x { if (!success) { - IOUtils.CloseWhileHandlingException(TermsOut, FreqOut); + IOUtils.DisposeWhileHandlingException(TermsOut, FreqOut); } } @@ -100,7 +100,7 @@ namespace Lucene.Net.Codecs.Lucene3x { if (disposing) { - IOUtils.Close(TermsOut, FreqOut, ProxOut); + IOUtils.Dispose(TermsOut, FreqOut, ProxOut); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWNormsConsumer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWNormsConsumer.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWNormsConsumer.cs index 2a91121..595c4a2 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWNormsConsumer.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWNormsConsumer.cs @@ -73,7 +73,7 @@ namespace Lucene.Net.Codecs.Lucene3x { if (!success) { - IOUtils.CloseWhileHandlingException(output); + IOUtils.DisposeWhileHandlingException(output); } } } @@ -95,7 +95,7 @@ namespace Lucene.Net.Codecs.Lucene3x protected override void Dispose(bool disposing) { if (disposing) - IOUtils.Close(@out); + IOUtils.Dispose(@out); } public override void AddBinaryField(FieldInfo field, IEnumerable<BytesRef> values) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs index f37ffe1..22ccdf0 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWStoredFieldsWriter.cs @@ -83,7 +83,7 @@ namespace Lucene.Net.Codecs.Lucene3x { try { - IOUtils.Close(FieldsStream, IndexStream); + IOUtils.Dispose(FieldsStream, IndexStream); } finally { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs index c1797fa..c68a67d 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsWriter.cs @@ -228,7 +228,7 @@ namespace Lucene.Net.Codecs.Lucene3x { // make an effort to close all streams we can but remember and re-throw // the first exception encountered in this process - IOUtils.Close(Tvx, Tvd, Tvf); + IOUtils.Dispose(Tvx, Tvd, Tvf); Tvx = Tvd = Tvf = null; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs index f64a99b..edd82dc 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/TermInfosWriter.cs @@ -108,7 +108,7 @@ namespace Lucene.Net.Codecs.Lucene3x { if (!success) { - IOUtils.CloseWhileHandlingException(Output); + IOUtils.DisposeWhileHandlingException(Output); try { @@ -149,7 +149,7 @@ namespace Lucene.Net.Codecs.Lucene3x { if (!success) { - IOUtils.CloseWhileHandlingException(Output); + IOUtils.DisposeWhileHandlingException(Output); try { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs index 18b157f..5ffa6f7 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40DocValuesWriter.cs @@ -93,11 +93,11 @@ namespace Lucene.Net.Codecs.Lucene40 { if (success) { - IOUtils.Close(data); + IOUtils.Dispose(data); } else { - IOUtils.CloseWhileHandlingException(data); + IOUtils.DisposeWhileHandlingException(data); } } } @@ -232,11 +232,11 @@ namespace Lucene.Net.Codecs.Lucene40 { if (success) { - IOUtils.Close(data, index); + IOUtils.Dispose(data, index); } else { - IOUtils.CloseWhileHandlingException(data, index); + IOUtils.DisposeWhileHandlingException(data, index); } } } @@ -258,11 +258,11 @@ namespace Lucene.Net.Codecs.Lucene40 { if (success) { - IOUtils.Close(data); + IOUtils.Dispose(data); } else { - IOUtils.CloseWhileHandlingException(data); + IOUtils.DisposeWhileHandlingException(data); } } } @@ -285,11 +285,11 @@ namespace Lucene.Net.Codecs.Lucene40 { if (success) { - IOUtils.Close(data, index); + IOUtils.Dispose(data, index); } else { - IOUtils.CloseWhileHandlingException(data, index); + IOUtils.DisposeWhileHandlingException(data, index); } } } @@ -520,11 +520,11 @@ namespace Lucene.Net.Codecs.Lucene40 { if (success) { - IOUtils.Close(data, index); + IOUtils.Dispose(data, index); } else { - IOUtils.CloseWhileHandlingException(data, index); + IOUtils.DisposeWhileHandlingException(data, index); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40FieldInfosWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40FieldInfosWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40FieldInfosWriter.cs index 908ee7d..0e0a7c7 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40FieldInfosWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40FieldInfosWriter.cs @@ -109,7 +109,7 @@ namespace Lucene.Net.Codecs.Lucene40 } else { - IOUtils.CloseWhileHandlingException(output); + IOUtils.DisposeWhileHandlingException(output); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs index 4d99635..4ae4a18 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene40/Lucene40PostingsWriter.cs @@ -140,7 +140,7 @@ namespace Lucene.Net.Codecs.Lucene40 { if (!success) { - IOUtils.CloseWhileHandlingException(FreqOut, proxOut); + IOUtils.DisposeWhileHandlingException(FreqOut, proxOut); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs index 32e943b..4f63876 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42DocValuesConsumer.cs @@ -75,7 +75,7 @@ namespace Lucene.Net.Codecs.Lucene42 { if (!success) { - IOUtils.CloseWhileHandlingException(this); + IOUtils.DisposeWhileHandlingException(this); } } } @@ -224,11 +224,11 @@ namespace Lucene.Net.Codecs.Lucene42 { if (success) { - IOUtils.Close(Data, Meta); + IOUtils.Dispose(Data, Meta); } else { - IOUtils.CloseWhileHandlingException(Data, Meta); + IOUtils.DisposeWhileHandlingException(Data, Meta); } } }
