http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42FieldInfosWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42FieldInfosWriter.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42FieldInfosWriter.cs index f8a3d07..b519986 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42FieldInfosWriter.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Lucene42/Lucene42FieldInfosWriter.cs @@ -109,7 +109,7 @@ namespace Lucene.Net.Codecs.Lucene42 } else { - IOUtils.CloseWhileHandlingException(output); + IOUtils.DisposeWhileHandlingException(output); } } }
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockFixedIntBlockPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockFixedIntBlockPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockFixedIntBlockPostingsFormat.cs index 6d83470..4208dfe 100644 --- a/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockFixedIntBlockPostingsFormat.cs +++ b/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockFixedIntBlockPostingsFormat.cs @@ -130,7 +130,7 @@ namespace Lucene.Net.Codecs.MockIntBlock { if (!success) { - IOUtils.CloseWhileHandlingException(output); + IOUtils.DisposeWhileHandlingException(output); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockVariableIntBlockPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockVariableIntBlockPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockVariableIntBlockPostingsFormat.cs index ff6353e..891aab5 100644 --- a/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockVariableIntBlockPostingsFormat.cs +++ b/src/Lucene.Net.TestFramework/Codecs/MockIntBlock/MockVariableIntBlockPostingsFormat.cs @@ -134,7 +134,7 @@ namespace Lucene.Net.Codecs.MockIntBlock { if (!success) { - IOUtils.CloseWhileHandlingException(output); + IOUtils.DisposeWhileHandlingException(output); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs b/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs index 87c232d..82929ca 100644 --- a/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs +++ b/src/Lucene.Net.TestFramework/Codecs/MockSep/MockSingleIntIndexOutput.cs @@ -51,7 +51,7 @@ namespace Lucene.Net.Codecs.MockSep { if (!success) { - IOUtils.CloseWhileHandlingException(@out); + IOUtils.DisposeWhileHandlingException(@out); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/NestedPulsing/NestedPulsingPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/NestedPulsing/NestedPulsingPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/NestedPulsing/NestedPulsingPostingsFormat.cs index 3f12ebe..216c8fb 100644 --- a/src/Lucene.Net.TestFramework/Codecs/NestedPulsing/NestedPulsingPostingsFormat.cs +++ b/src/Lucene.Net.TestFramework/Codecs/NestedPulsing/NestedPulsingPostingsFormat.cs @@ -61,7 +61,7 @@ namespace Lucene.Net.Codecs.NestedPulsing { if (!success) { - IOUtils.CloseWhileHandlingException(docsWriter, pulsingWriterInner, pulsingWriter); + IOUtils.DisposeWhileHandlingException(docsWriter, pulsingWriterInner, pulsingWriter); } } } @@ -90,7 +90,7 @@ namespace Lucene.Net.Codecs.NestedPulsing { if (!success) { - IOUtils.CloseWhileHandlingException(docsReader, pulsingReaderInner, pulsingReader); + IOUtils.DisposeWhileHandlingException(docsReader, pulsingReaderInner, pulsingReader); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs index 9a8f03d..62cb78d 100644 --- a/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs +++ b/src/Lucene.Net.TestFramework/Codecs/RAMOnly/RAMOnlyPostingsFormat.cs @@ -686,11 +686,11 @@ namespace Lucene.Net.Codecs.RAMOnly { if (!success) { - IOUtils.CloseWhileHandlingException(@out); + IOUtils.DisposeWhileHandlingException(@out); } else { - IOUtils.Close(@out); + IOUtils.Dispose(@out); } } @@ -721,11 +721,11 @@ namespace Lucene.Net.Codecs.RAMOnly { if (!success) { - IOUtils.CloseWhileHandlingException(@in); + IOUtils.DisposeWhileHandlingException(@in); } else { - IOUtils.Close(@in); + IOUtils.Dispose(@in); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs index 5860f89..22c6a5b 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs @@ -109,7 +109,7 @@ namespace Lucene.Net.Analysis.Core } finally { - IOUtils.CloseWhileHandlingException(stream); + IOUtils.DisposeWhileHandlingException(stream); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs index 447bf18..d98f782 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs @@ -59,7 +59,7 @@ namespace Lucene.Net.Analysis.Core } finally { - IOUtils.CloseWhileHandlingException(stream); + IOUtils.DisposeWhileHandlingException(stream); } } @@ -84,7 +84,7 @@ namespace Lucene.Net.Analysis.Core } finally { - IOUtils.CloseWhileHandlingException(stream); + IOUtils.DisposeWhileHandlingException(stream); } } @@ -114,7 +114,7 @@ namespace Lucene.Net.Analysis.Core } finally { - IOUtils.CloseWhileHandlingException(stream); + IOUtils.DisposeWhileHandlingException(stream); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs index 2c691a7..f911bfe 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs @@ -65,8 +65,8 @@ namespace Lucene.Net.Analysis.Hunspell } finally { - IOUtils.CloseWhileHandlingException(affixStream); - IOUtils.CloseWhileHandlingException(null, dictStreams); + IOUtils.DisposeWhileHandlingException(affixStream); + IOUtils.DisposeWhileHandlingException(null, dictStreams); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs index 8873b7a..4ece2fb 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs @@ -41,7 +41,7 @@ namespace Lucene.Net.Analysis.Hunspell } finally { - IOUtils.CloseWhileHandlingException(affixStream, dictStream); + IOUtils.DisposeWhileHandlingException(affixStream, dictStream); } } @@ -140,7 +140,7 @@ namespace Lucene.Net.Analysis.Hunspell } finally { - IOUtils.CloseWhileHandlingException(affixStream, dictStream); + IOUtils.DisposeWhileHandlingException(affixStream, dictStream); } Analyzer a = new AnalyzerAnonymousInnerClassHelper3(this, d); CheckOneTerm(a, "NoChAnGy", "NoChAnGy"); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs index c08c1db..e3aa88e 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs @@ -49,7 +49,7 @@ namespace Lucene.Net.Analysis.Miscellaneous } finally { - IOUtils.CloseWhileHandlingException(tokenStream); + IOUtils.DisposeWhileHandlingException(tokenStream); } tokenStream = analyzer.GetTokenStream("special", text); @@ -65,7 +65,7 @@ namespace Lucene.Net.Analysis.Miscellaneous } finally { - IOUtils.CloseWhileHandlingException(tokenStream); + IOUtils.DisposeWhileHandlingException(tokenStream); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs index a711d7d..e5caf56 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs @@ -110,7 +110,7 @@ namespace Lucene.Net.Analysis.Shingle } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } ScoreDoc[] hits = searcher.Search(q, null, 1000).ScoreDocs; @@ -143,7 +143,7 @@ namespace Lucene.Net.Analysis.Shingle } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } ScoreDoc[] hits = searcher.Search(q, null, 1000).ScoreDocs; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs index f9f935f..79249c8 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs @@ -142,7 +142,7 @@ namespace Lucene.Net.Analysis.Util } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } } // just for fun @@ -205,7 +205,7 @@ namespace Lucene.Net.Analysis.Util } finally { - IOUtils.CloseWhileHandlingException(ts); + IOUtils.DisposeWhileHandlingException(ts); } } // just for fun http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs index 7a5f12f..7bbfcef 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs @@ -32,7 +32,7 @@ namespace Lucene.Net.Analysis.Util { try { - IOUtils.CloseWhileHandlingException(rl.OpenResource("/this-directory-really-really-really-should-not-exist/foo/bar.txt")); + IOUtils.DisposeWhileHandlingException(rl.OpenResource("/this-directory-really-really-really-should-not-exist/foo/bar.txt")); fail("The resource does not exist, should fail!"); } catch (IOException) @@ -87,7 +87,7 @@ namespace Lucene.Net.Analysis.Util } finally { - IOUtils.CloseWhileHandlingException(os); + IOUtils.DisposeWhileHandlingException(os); } IResourceLoader rl = new FilesystemResourceLoader(@base); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs index 9233dfd..048ebcf 100644 --- a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs +++ b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs @@ -280,7 +280,7 @@ namespace Lucene.Net.Facet.Range Assert.AreEqual(11, dsr.Hits.TotalHits); Assert.AreEqual("dim=dim path=[] value=11 childCount=2\n b (8)\n a (3)\n", dsr.Facets.GetTopChildren(10, "dim").ToString()); Assert.AreEqual("dim=field path=[] value=21 childCount=5\n less than 10 (10)\n less than or equal to 10 (11)\n over 90 (9)\n 90 or above (10)\n over 1000 (0)\n", dsr.Facets.GetTopChildren(10, "field").ToString()); - IOUtils.Close(tw, tr, td, w, r, d); + IOUtils.Dispose(tw, tr, td, w, r, d); } private class DrillSidewaysAnonymousInnerClassHelper : DrillSideways @@ -349,7 +349,7 @@ namespace Lucene.Net.Facet.Range Assert.AreEqual("dim=field path=[] value=21 childCount=5\n less than 10 (10)\n less than or equal to 10 (11)\n over 90 (9)\n 90 or above (10)\n over 1000 (0)\n", facets.GetTopChildren(10, "field").ToString()); - IOUtils.Close(w, r, d); + IOUtils.Dispose(w, r, d); } [Test] @@ -377,7 +377,7 @@ namespace Lucene.Net.Facet.Range Assert.AreEqual("dim=field path=[] value=21 childCount=5\n less than 10 (10)\n less than or equal to 10 (11)\n over 90 (9)\n 90 or above (10)\n over 1000 (0)\n", facets.GetTopChildren(10, "field").ToString()); - IOUtils.Close(w, r, d); + IOUtils.Dispose(w, r, d); } [Test] @@ -570,7 +570,7 @@ namespace Lucene.Net.Facet.Range } } - IOUtils.Close(w, r, dir); + IOUtils.Dispose(w, r, dir); } [Test] @@ -775,7 +775,7 @@ namespace Lucene.Net.Facet.Range } } - IOUtils.Close(w, r, dir); + IOUtils.Dispose(w, r, dir); } [Test] @@ -962,7 +962,7 @@ namespace Lucene.Net.Facet.Range } } - IOUtils.Close(w, r, dir); + IOUtils.Dispose(w, r, dir); } // LUCENE-5178 @@ -997,7 +997,7 @@ namespace Lucene.Net.Facet.Range Assert.AreEqual("dim=field path=[] value=16 childCount=5\n less than 10 (8)\n less than or equal to 10 (8)\n over 90 (8)\n 90 or above (8)\n over 1000 (0)\n", facets.GetTopChildren(10, "field").ToString()); - IOUtils.Close(w, r, d); + IOUtils.Dispose(w, r, d); } [Test] @@ -1062,7 +1062,7 @@ namespace Lucene.Net.Facet.Range Assert.AreEqual(1, dsr.Hits.TotalHits); Assert.AreEqual("dim=field path=[] value=3 childCount=6\n < 1 (0)\n < 2 (1)\n < 5 (3)\n < 10 (3)\n < 20 (3)\n < 50 (3)\n", dsr.Facets.GetTopChildren(10, "field").ToString()); - IOUtils.Close(r, writer, dir); + IOUtils.Dispose(r, writer, dir); } private class ValueSourceAnonymousInnerClassHelper : ValueSource http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs index fe385d1..91ea391 100644 --- a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs +++ b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs @@ -95,7 +95,7 @@ namespace Lucene.Net.Facet.SortedSet TopDocs hits = searcher.Search(q, 1); Assert.AreEqual(1, hits.TotalHits); - IOUtils.Close(writer, searcher.IndexReader, dir); + IOUtils.Dispose(writer, searcher.IndexReader, dir); } // LUCENE-5090 @@ -280,7 +280,7 @@ namespace Lucene.Net.Facet.SortedSet // Ask for top 10 labels for any dims that have counts: Assert.AreEqual("dim=a path=[] value=2 childCount=2\n foo1 (1)\n foo2 (1)\n", facets.GetTopChildren(10, "a").ToString()); - IOUtils.Close(writer, searcher.IndexReader, dir); + IOUtils.Dispose(writer, searcher.IndexReader, dir); } @@ -387,7 +387,7 @@ namespace Lucene.Net.Facet.SortedSet CollectionAssert.AreEqual(expected, actual); } - IOUtils.Close(w, searcher.IndexReader, indexDir, taxoDir); + IOUtils.Dispose(w, searcher.IndexReader, indexDir, taxoDir); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs index a6981a1..fc8db8f 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs @@ -71,7 +71,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory validate(dirs[0], dirs[1], map); - IOUtils.Close(dirs); + IOUtils.Dispose(dirs); } private class ThreadAnonymousInnerClassHelper : ThreadClass @@ -175,7 +175,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory validate(dest, src, map); - IOUtils.Close(dest, src); + IOUtils.Dispose(dest, src); } [Test] @@ -196,7 +196,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory validate(dest, src, map); - IOUtils.Close(dest, src); + IOUtils.Dispose(dest, src); } // A more comprehensive and big random test. @@ -242,7 +242,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory validate(dest, src, map); - IOUtils.Close(dest, src); + IOUtils.Dispose(dest, src); } [Test] @@ -285,7 +285,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory } dtr.Dispose(); - IOUtils.Close(src, dest); + IOUtils.Dispose(src, dest); } private class ThreadAnonymousInnerClassHelper2 : ThreadClass http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs index ee95b0d..969a970 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs @@ -166,7 +166,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory } } - IOUtils.Close(tw, iw, tr, taxoDir, indexDir); + IOUtils.Dispose(tw, iw, tr, taxoDir, indexDir); } private class ThreadAnonymousInnerClassHelper : ThreadClass http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs index 3fcabb8..d4b8f90 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs @@ -101,7 +101,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory } finally { - IOUtils.Close(ltw, ltr, dir); + IOUtils.Dispose(ltw, ltr, dir); } } @@ -193,7 +193,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory } finally { - IOUtils.Close(tr as DirectoryTaxonomyReader, tw, dir); + IOUtils.Dispose(tr as DirectoryTaxonomyReader, tw, dir); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs index a8c3930..62ca95c 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs @@ -342,7 +342,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory } } - IOUtils.Close(dtr, dir); + IOUtils.Dispose(dtr, dir); } private class ThreadAnonymousInnerClassHelper : ThreadClass @@ -541,7 +541,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory // when too large components were allowed to be added, this resulted in a new added category Assert.AreEqual(ordinal, taxoWriter.AddCategory(cp)); - IOUtils.Close(indexWriter, taxoWriter); + IOUtils.Dispose(indexWriter, taxoWriter); DirectoryReader indexReader = DirectoryReader.Open(indexDir); var taxoReader = new DirectoryTaxonomyReader(taxoDir); @@ -550,7 +550,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory ddq.Add("dim", bigs); Assert.AreEqual(1, searcher.Search(ddq, 10).TotalHits); - IOUtils.Close(indexReader, taxoReader, indexDir, taxoDir); + IOUtils.Dispose(indexReader, taxoReader, indexDir, taxoDir); } [Test] http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs index 77aa338..b48c6c5 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs @@ -78,7 +78,7 @@ namespace Lucene.Net.Facet.Taxonomy } } - IOUtils.Close(writer, taxoWriter, reader, indexDir, taxoDir); + IOUtils.Dispose(writer, taxoWriter, reader, indexDir, taxoDir); } private class ThreadAnonymousInnerClassHelper : ThreadClass http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs index a7ff6d6..f587bd4 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs @@ -207,7 +207,7 @@ namespace Lucene.Net.Facet.Taxonomy Console.WriteLine("TEST: now stop"); } - IOUtils.Close(mgr, tw, w, taxoDir, dir); + IOUtils.Dispose(mgr, tw, w, taxoDir, dir); } private class ThreadAnonymousInnerClassHelper : ThreadClass @@ -314,7 +314,7 @@ namespace Lucene.Net.Facet.Taxonomy Console.WriteLine("TEST: now stop"); } - IOUtils.Close(mgr, tw, w, taxoDir, indexDir); + IOUtils.Dispose(mgr, tw, w, taxoDir, indexDir); } [Test] @@ -344,7 +344,7 @@ namespace Lucene.Net.Facet.Taxonomy // expected } - IOUtils.Close(mgr, tw, w, taxoDir, dir); + IOUtils.Dispose(mgr, tw, w, taxoDir, dir); } [Test] @@ -390,7 +390,7 @@ namespace Lucene.Net.Facet.Taxonomy mgr.Release(pair); } - IOUtils.Close(mgr, tw, w, taxoDir, indexDir); + IOUtils.Dispose(mgr, tw, w, taxoDir, indexDir); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs index 6f3b1e5..774377b 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs @@ -211,7 +211,7 @@ namespace Lucene.Net.Facet.Taxonomy { // expected } - IOUtils.Close(writer, taxoWriter, dir, taxoDir); + IOUtils.Dispose(writer, taxoWriter, dir, taxoDir); } [Test] @@ -236,7 +236,7 @@ namespace Lucene.Net.Facet.Taxonomy { // expected } - IOUtils.Close(writer, taxoWriter, dir, taxoDir); + IOUtils.Dispose(writer, taxoWriter, dir, taxoDir); } [Test] @@ -261,7 +261,7 @@ namespace Lucene.Net.Facet.Taxonomy { // expected } - IOUtils.Close(writer, taxoWriter, dir, taxoDir); + IOUtils.Dispose(writer, taxoWriter, dir, taxoDir); } [Test] http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs index 705b476..4fcdc36 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs @@ -148,7 +148,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.True(result.IndexOf(" /2012", StringComparison.Ordinal) != -1); Assert.True(result.IndexOf(" /20", StringComparison.Ordinal) != -1); - IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, taxoDir, dir); + IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, taxoDir, dir); } // LUCENE-5333 @@ -209,7 +209,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual("dim=b path=[] value=2 childCount=2\n bar1 (1)\n bar2 (1)\n", results[1].ToString()); Assert.AreEqual("dim=c path=[] value=1 childCount=1\n baz1 (1)\n", results[2].ToString()); - IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, taxoDir, dir); + IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, taxoDir, dir); } [Test] @@ -279,7 +279,7 @@ namespace Lucene.Net.Facet.Taxonomy // expected } - IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, taxoDir, dir); + IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, taxoDir, dir); } [Test] @@ -297,7 +297,7 @@ namespace Lucene.Net.Facet.Taxonomy doc.Add(NewTextField("field", "text", Field.Store.NO)); doc.Add(new FacetField("a", "path")); writer.AddDocument(config.Build(taxoWriter, doc)); - IOUtils.Close(writer, taxoWriter, dir, taxoDir); + IOUtils.Dispose(writer, taxoWriter, dir, taxoDir); } private class PerFieldSimilarityWrapperAnonymousInnerClassHelper : PerFieldSimilarityWrapper @@ -366,7 +366,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual(1, result.LabelValues.Length); Assert.AreEqual(1, (int)result.LabelValues[0].Value); - IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir); + IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir); } [Test] @@ -401,7 +401,7 @@ namespace Lucene.Net.Facet.Taxonomy FacetResult result = facets.GetTopChildren(10, "dim"); Assert.AreEqual("dim=dim path=[] value=-1 childCount=2\n test\u001Fone (1)\n test\u001Etwo (1)\n", result.ToString()); - IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir); + IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir); } [Test] @@ -455,7 +455,7 @@ namespace Lucene.Net.Facet.Taxonomy } Assert.AreEqual(1, facets.GetSpecificValue("dim2")); Assert.AreEqual(1, facets.GetSpecificValue("dim3")); - IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir); + IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir); } // LUCENE-4583: make sure if we require > 32 KB for one @@ -509,7 +509,7 @@ namespace Lucene.Net.Facet.Taxonomy } Assert.AreEqual(numLabels, allLabels.Count); - IOUtils.Close(searcher.IndexReader, taxoWriter, writer, taxoReader, dir, taxoDir); + IOUtils.Dispose(searcher.IndexReader, taxoWriter, writer, taxoReader, dir, taxoDir); } // Make sure we catch when app didn't declare field as @@ -535,7 +535,7 @@ namespace Lucene.Net.Facet.Taxonomy { // expected } - IOUtils.Close(writer, taxoWriter, dir, taxoDir); + IOUtils.Dispose(writer, taxoWriter, dir, taxoDir); } // Make sure we catch when app didn't declare field as @@ -562,7 +562,7 @@ namespace Lucene.Net.Facet.Taxonomy { // expected } - IOUtils.Close(writer, taxoWriter, dir, taxoDir); + IOUtils.Dispose(writer, taxoWriter, dir, taxoDir); } [Test] @@ -594,7 +594,7 @@ namespace Lucene.Net.Facet.Taxonomy Facets facets2 = GetTaxonomyFacetCounts(taxoReader, config, sfc, "$b"); Assert.AreEqual(r.MaxDoc, (int)facets1.GetTopChildren(10, "a").Value); Assert.AreEqual(r.MaxDoc, (int)facets2.GetTopChildren(10, "b").Value); - IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); + IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); } [Test] @@ -626,7 +626,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual(r.NumDocs, (int)result.Value); } - IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); + IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); } [Test] @@ -656,7 +656,7 @@ namespace Lucene.Net.Facet.Taxonomy IList<FacetResult> res2 = facets.GetAllDims(10); Assert.AreEqual(res1, res2, "calling getFacetResults twice should return the .equals()=true result"); - IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); + IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); } [Test] @@ -685,7 +685,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual(10, facets.GetTopChildren(2, "a").ChildCount); - IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); + IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); } private void indexTwoDocs(ITaxonomyWriter taxoWriter, IndexWriter indexWriter, FacetsConfig config, bool withContent) @@ -731,7 +731,7 @@ namespace Lucene.Net.Facet.Taxonomy indexTwoDocs(taxoWriter, indexWriter, null, true); // 5th segment, with content, no categories indexTwoDocs(taxoWriter, indexWriter, config, true); // 6th segment, with content, with categories indexTwoDocs(taxoWriter, indexWriter, null, true); // 7th segment, with content, no categories - IOUtils.Close(indexWriter, taxoWriter); + IOUtils.Dispose(indexWriter, taxoWriter); DirectoryReader indexReader = DirectoryReader.Open(indexDir); var taxoReader = new DirectoryTaxonomyReader(taxoDir); @@ -749,7 +749,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual(2, (int)labelValue.Value, "wrong weight for child " + labelValue.Label); } - IOUtils.Close(indexReader, taxoReader, indexDir, taxoDir); + IOUtils.Dispose(indexReader, taxoReader, indexDir, taxoDir); } [Test] @@ -854,7 +854,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual(expected, actual); } - IOUtils.Close(w, tw, searcher.IndexReader, tr, indexDir, taxoDir); + IOUtils.Dispose(w, tw, searcher.IndexReader, tr, indexDir, taxoDir); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs index ef1f02c..a154a73 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs @@ -88,7 +88,7 @@ namespace Lucene.Net.Facet.Taxonomy [OneTimeTearDown] public override void AfterClass() // LUCENENET specific - renamed from AfterClassCountingFacetsAggregatorTest() to ensure calling order { - IOUtils.Close(indexDir, taxoDir); + IOUtils.Dispose(indexDir, taxoDir); base.AfterClass(); } @@ -280,7 +280,7 @@ namespace Lucene.Net.Facet.Taxonomy // segment w/ categories and some content IndexDocsWithFacetsAndSomeTerms(indexWriter, taxoWriter, allExpectedCounts); - IOUtils.Close(indexWriter, taxoWriter); + IOUtils.Dispose(indexWriter, taxoWriter); } [Test] @@ -308,7 +308,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual(termExpectedCounts[CP_B + "/" + labelValue.Label], labelValue.Value); } - IOUtils.Close(indexReader, taxoReader); + IOUtils.Dispose(indexReader, taxoReader); } [Test] @@ -343,7 +343,7 @@ namespace Lucene.Net.Facet.Taxonomy prevValue = (int)labelValue.Value; } - IOUtils.Close(indexReader, taxoReader); + IOUtils.Dispose(indexReader, taxoReader); } [Test] @@ -371,7 +371,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual(allExpectedCounts[CP_B + "/" + labelValue.Label], labelValue.Value); } - IOUtils.Close(indexReader, taxoReader); + IOUtils.Dispose(indexReader, taxoReader); } [Test] @@ -399,7 +399,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual(allExpectedCounts[CP_D + "/" + labelValue.Label], labelValue.Value); } - IOUtils.Close(indexReader, taxoReader); + IOUtils.Dispose(indexReader, taxoReader); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs index 950ef32..0923018 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs @@ -197,7 +197,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual("dim=b path=[] value=50.0 childCount=2\n bar2 (30.0)\n bar1 (20.0)\n", results[1].ToString()); Assert.AreEqual("dim=c path=[] value=30.0 childCount=1\n baz1 (30.0)\n", results[2].ToString()); - IOUtils.Close(searcher.IndexReader, taxoReader, dir, taxoDir); + IOUtils.Dispose(searcher.IndexReader, taxoReader, dir, taxoDir); } [Test] @@ -258,7 +258,7 @@ namespace Lucene.Net.Facet.Taxonomy // expected } - IOUtils.Close(searcher.IndexReader, taxoReader, dir, taxoDir); + IOUtils.Dispose(searcher.IndexReader, taxoReader, dir, taxoDir); } [Test] @@ -297,7 +297,7 @@ namespace Lucene.Net.Facet.Taxonomy int expected = (int)(td.MaxScore * td.TotalHits); Assert.AreEqual(expected, (int)facets.GetSpecificValue("dim", "a")); - IOUtils.Close(iw, taxoWriter, taxoReader, taxoDir, r, indexDir); + IOUtils.Dispose(iw, taxoWriter, taxoReader, taxoDir, r, indexDir); } [Test] @@ -325,7 +325,7 @@ namespace Lucene.Net.Facet.Taxonomy Facets facets = new TaxonomyFacetSumValueSource(taxoReader, config, sfc, new Int64FieldSource("price")); Assert.AreEqual("dim=a path=[] value=10.0 childCount=2\n 1 (6.0)\n 0 (4.0)\n", facets.GetTopChildren(10, "a").ToString()); - IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); + IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); } [Test] @@ -359,7 +359,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual("dim=a path=[] value=10.0 childCount=2\n 1 (6.0)\n 0 (4.0)\n", facets.GetTopChildren(10, "a").ToString()); - IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); + IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); } private class ValueSourceAnonymousInnerClassHelper : ValueSource @@ -451,7 +451,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual("dim=a path=[] value=10.0 childCount=2\n 1 (6.0)\n 0 (4.0)\n", facets.GetTopChildren(10, "a").ToString()); - IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); + IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); } [Test] @@ -485,7 +485,7 @@ namespace Lucene.Net.Facet.Taxonomy Assert.AreEqual(r.MaxDoc, (int)facets1.GetTopChildren(10, "a").Value); Assert.AreEqual(r.MaxDoc, (double)facets2.GetTopChildren(10, "b").Value, 1E-10); - IOUtils.Close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); + IOUtils.Dispose(taxoWriter, iw, taxoReader, taxoDir, r, indexDir); } [Test] @@ -600,7 +600,7 @@ namespace Lucene.Net.Facet.Taxonomy AssertFloatValuesEquals(expected, actual); } - IOUtils.Close(w, tw, searcher.IndexReader, tr, indexDir, taxoDir); + IOUtils.Dispose(w, tw, searcher.IndexReader, tr, indexDir, taxoDir); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs index 4227f8c..221f815 100644 --- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs +++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs @@ -59,7 +59,7 @@ namespace Lucene.Net.Facet [OneTimeTearDown] public override void AfterClass() // LUCENENET specific - renamed from AfterClassDrillDownQueryTest() to ensure calling order { - IOUtils.Close(reader, taxo, dir, taxoDir); + IOUtils.Dispose(reader, taxo, dir, taxoDir); reader = null; taxo = null; dir = null; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs index 636a0e5..b8f1ab6 100644 --- a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs +++ b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs @@ -246,7 +246,7 @@ namespace Lucene.Net.Facet Assert.AreEqual(0, r.Hits.TotalHits); Assert.Null(r.Facets.GetTopChildren(10, "Publish Date")); Assert.Null(r.Facets.GetTopChildren(10, "Author")); - IOUtils.Close(searcher.IndexReader, taxoReader, writer, taxoWriter, dir, taxoDir); + IOUtils.Dispose(searcher.IndexReader, taxoReader, writer, taxoWriter, dir, taxoDir); } [Test] @@ -302,7 +302,7 @@ namespace Lucene.Net.Facet // published once: Assert.AreEqual("dim=Author path=[] value=2 childCount=2\n Bob (1)\n Lisa (1)\n", r.Facets.GetTopChildren(10, "Author").ToString()); - IOUtils.Close(searcher.IndexReader, taxoReader, writer, taxoWriter, dir, taxoDir); + IOUtils.Dispose(searcher.IndexReader, taxoReader, writer, taxoWriter, dir, taxoDir); } [Test] @@ -359,7 +359,7 @@ namespace Lucene.Net.Facet Assert.AreEqual("dim=dim path=[] value=6 childCount=4\n a (3)\n b (1)\n c (1)\n d (1)\n", r.Facets.GetTopChildren(10, "dim").ToString()); Assert.AreEqual("dim=dim path=[a] value=3 childCount=3\n x (1)\n y (1)\n z (1)\n", r.Facets.GetTopChildren(10, "dim", "a").ToString()); - IOUtils.Close(searcher.IndexReader, taxoReader, writer, taxoWriter, dir, taxoDir); + IOUtils.Dispose(searcher.IndexReader, taxoReader, writer, taxoWriter, dir, taxoDir); } internal class Doc : IComparable<Doc> @@ -802,7 +802,7 @@ namespace Lucene.Net.Facet } } - IOUtils.Close(r, tr, w, tw, d, td); + IOUtils.Dispose(r, tr, w, tw, d, td); } private class FilterAnonymousInnerClassHelper : Filter @@ -1318,7 +1318,7 @@ namespace Lucene.Net.Facet r = ds.Search(ddq, null, null, 10, new Sort(new SortField("foo", SortFieldType.INT32)), false, false); // this used to fail on IllegalArgEx Assert.AreEqual(0, r.Hits.TotalHits); - IOUtils.Close(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir); + IOUtils.Dispose(writer, taxoWriter, searcher.IndexReader, taxoReader, dir, taxoDir); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs b/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs index a0772dc..cb2db07 100644 --- a/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs +++ b/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs @@ -79,7 +79,7 @@ namespace Lucene.Net.Facet // these two addDocument() used to fail indexWriter.AddDocument(doc); indexWriter.AddDocument(doc); - IOUtils.Close(indexWriter, taxoWriter); + IOUtils.Dispose(indexWriter, taxoWriter); DirectoryReader indexReader = DirectoryReader.Open(indexDir); DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir); @@ -91,9 +91,9 @@ namespace Lucene.Net.Facet FacetResult res = facets.GetTopChildren(10, "a"); Assert.AreEqual(1, res.LabelValues.Length); Assert.AreEqual(2, res.LabelValues[0].Value); - IOUtils.Close(indexReader, taxoReader); + IOUtils.Dispose(indexReader, taxoReader); - IOUtils.Close(indexDir, taxoDir); + IOUtils.Dispose(indexDir, taxoDir); } /// <summary> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs b/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs index 8c4d86b..a8612e8 100644 --- a/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs +++ b/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs @@ -86,7 +86,7 @@ namespace Lucene.Net.Facet assertOrdinalsExist("$facets", ir); - IOUtils.Close(tr, ir, iw, tw, indexDir, taxoDir); + IOUtils.Dispose(tr, ir, iw, tw, indexDir, taxoDir); } [Test] @@ -125,7 +125,7 @@ namespace Lucene.Net.Facet assertOrdinalsExist("$facets", ir); assertOrdinalsExist("$author", ir); - IOUtils.Close(tr, ir, iw, tw, indexDir, taxoDir); + IOUtils.Dispose(tr, ir, iw, tw, indexDir, taxoDir); } [Test] @@ -168,7 +168,7 @@ namespace Lucene.Net.Facet assertOrdinalsExist("$music", ir); assertOrdinalsExist("$music", ir); - IOUtils.Close(tr, ir, iw, tw, indexDir, taxoDir); + IOUtils.Dispose(tr, ir, iw, tw, indexDir, taxoDir); } private void assertOrdinalsExist(string field, IndexReader ir) @@ -222,7 +222,7 @@ namespace Lucene.Net.Facet assertOrdinalsExist("$bands", ir); assertOrdinalsExist("$composers", ir); - IOUtils.Close(tr, ir, iw, tw, indexDir, taxoDir); + IOUtils.Dispose(tr, ir, iw, tw, indexDir, taxoDir); } [Test] @@ -265,8 +265,8 @@ namespace Lucene.Net.Facet assertOrdinalsExist("$music", ir); assertOrdinalsExist("$literature", ir); - IOUtils.Close(tr, ir, iw, tw); - IOUtils.Close(indexDir, taxoDir); + IOUtils.Dispose(tr, ir, iw, tw); + IOUtils.Dispose(indexDir, taxoDir); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs index b98b283..078484e 100644 --- a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs +++ b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs @@ -66,7 +66,7 @@ namespace Lucene.Net.Facet // NRT open IndexSearcher searcher = NewSearcher(writer.Reader); var taxoReader = new DirectoryTaxonomyReader(taxoWriter); - IOUtils.Close(writer, taxoWriter); + IOUtils.Dispose(writer, taxoWriter); // Test empty results RandomSamplingFacetsCollector collectRandomZeroResults = new RandomSamplingFacetsCollector(numDocs / 10, random.NextLong()); @@ -146,7 +146,7 @@ namespace Lucene.Net.Facet Assert.True(sigma < 200); Assert.True(targetMu - 3 * sigma < mu && mu < targetMu + 3 * sigma); - IOUtils.Close(searcher.IndexReader, taxoReader, dir, taxoDir); + IOUtils.Dispose(searcher.IndexReader, taxoReader, dir, taxoDir); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs index 6518171..21b4a98 100644 --- a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs +++ b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/AbstractTestCase.cs @@ -191,7 +191,7 @@ namespace Lucene.Net.Search.VectorHighlight } finally { - IOUtils.CloseWhileHandlingException(tokenStream); + IOUtils.DisposeWhileHandlingException(tokenStream); } return bytesRefs; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs index a7681d7..3eba683 100644 --- a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs +++ b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs @@ -141,7 +141,7 @@ namespace Lucene.Net.Index.Memory AtomicReader reader = (AtomicReader)memory.CreateSearcher().IndexReader; DirectoryReader competitor = DirectoryReader.Open(ramdir); DuellReaders(competitor, reader); - IOUtils.Close(reader, competitor); + IOUtils.Dispose(reader, competitor); AssertAllQueries(memory, ramdir, analyzer); ramdir.Dispose(); } @@ -506,7 +506,7 @@ namespace Lucene.Net.Index.Memory DirectoryReader competitor = DirectoryReader.Open(dir); AtomicReader memIndexReader = (AtomicReader)memory.CreateSearcher().IndexReader; DuellReaders(competitor, memIndexReader); - IOUtils.Close(competitor, memIndexReader); + IOUtils.Dispose(competitor, memIndexReader); memory.Reset(); dir.Dispose(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.QueryParser/Classic/TestMultiFieldQueryParser.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.QueryParser/Classic/TestMultiFieldQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Classic/TestMultiFieldQueryParser.cs index 8d66f19..a48ea0b 100644 --- a/src/Lucene.Net.Tests.QueryParser/Classic/TestMultiFieldQueryParser.cs +++ b/src/Lucene.Net.Tests.QueryParser/Classic/TestMultiFieldQueryParser.cs @@ -345,7 +345,7 @@ namespace Lucene.Net.QueryParsers.Classic if ("f1".equals(fieldName)) { // we don't use the reader, so close it: - IOUtils.CloseWhileHandlingException(reader); + IOUtils.DisposeWhileHandlingException(reader); // return empty reader, so MockTokenizer returns no tokens: return new StringReader(""); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestMultiFieldQPHelper.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestMultiFieldQPHelper.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestMultiFieldQPHelper.cs index 825dfe1..030678b 100644 --- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestMultiFieldQPHelper.cs +++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestMultiFieldQPHelper.cs @@ -412,7 +412,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard if ("f1".equals(fieldName)) { // we don't use the reader, so close it: - IOUtils.CloseWhileHandlingException(reader); + IOUtils.DisposeWhileHandlingException(reader); // return empty reader, so MockTokenizer returns no tokens: return new StringReader(""); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Spatial/SpatialTestCase.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Spatial/SpatialTestCase.cs b/src/Lucene.Net.Tests.Spatial/SpatialTestCase.cs index 06215e3..075cc2c 100644 --- a/src/Lucene.Net.Tests.Spatial/SpatialTestCase.cs +++ b/src/Lucene.Net.Tests.Spatial/SpatialTestCase.cs @@ -71,7 +71,7 @@ namespace Lucene.Net.Spatial public override void TearDown() { - IOUtils.Close(indexWriter, indexReader, directory); + IOUtils.Dispose(indexWriter, indexReader, directory); base.TearDown(); } @@ -99,7 +99,7 @@ namespace Lucene.Net.Spatial protected virtual void Commit() { indexWriter.Commit(); - IOUtils.Close(indexReader); + IOUtils.Dispose(indexReader); indexReader = indexWriter.Reader; indexSearcher = NewSearcher(indexReader); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs index e2e813b..07b4f6e 100644 --- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs +++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs @@ -191,7 +191,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.Tests/Analysis/TestMockAnalyzer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs b/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs index bbd141c..5f8ad17 100644 --- a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs +++ b/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs @@ -213,7 +213,7 @@ namespace Lucene.Net.Analysis } finally { - IOUtils.CloseWhileHandlingException(priorException, stream); + IOUtils.DisposeWhileHandlingException(priorException, stream); } AssertAnalyzesTo(analyzer, testString, new string[] { "t" }); @@ -298,7 +298,7 @@ namespace Lucene.Net.Analysis } finally { - IOUtils.CloseWhileHandlingException(priorException, ts); + IOUtils.DisposeWhileHandlingException(priorException, ts); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs b/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs index 4935c0d..ed5102f 100644 --- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs +++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs @@ -80,7 +80,7 @@ namespace Lucene.Net.Codecs.Lucene40 Assert.AreEqual(terms.Count, enums.Count); } - IOUtils.Close(writer, open, dir); + IOUtils.Dispose(writer, open, dir); } // tests for reuse only if bits are the same either null or the same instance @@ -129,7 +129,7 @@ namespace Lucene.Net.Codecs.Lucene40 } Assert.AreEqual(1, enums.Count); } - IOUtils.Close(writer, open, dir); + IOUtils.Dispose(writer, open, dir); } // make sure we never reuse from another reader even if it is the same field & codec etc @@ -177,7 +177,7 @@ namespace Lucene.Net.Codecs.Lucene40 } Assert.AreEqual(terms.Count, enums.Count); } - IOUtils.Close(writer, firstReader, secondReader, dir); + IOUtils.Dispose(writer, firstReader, secondReader, dir); } public virtual DocsEnum RandomDocsEnum(string field, BytesRef term, IList<AtomicReaderContext> readers, IBits bits) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs index ec53ddf..5be15ec 100644 --- a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs +++ b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs @@ -1392,7 +1392,7 @@ namespace Lucene.Net.Index // expected } - IOUtils.Close(w1, w2, src, dest); + IOUtils.Dispose(w1, w2, src, dest); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestAllFilesHaveChecksumFooter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestAllFilesHaveChecksumFooter.cs b/src/Lucene.Net.Tests/Index/TestAllFilesHaveChecksumFooter.cs index 9267a8a..2779dd5 100644 --- a/src/Lucene.Net.Tests/Index/TestAllFilesHaveChecksumFooter.cs +++ b/src/Lucene.Net.Tests/Index/TestAllFilesHaveChecksumFooter.cs @@ -102,11 +102,11 @@ namespace Lucene.Net.Index { if (success) { - IOUtils.Close(@in); + IOUtils.Dispose(@in); } else { - IOUtils.CloseWhileHandlingException(@in); + IOUtils.DisposeWhileHandlingException(@in); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs b/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs index e142ad0..0b6d28c 100644 --- a/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs +++ b/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs @@ -107,11 +107,11 @@ namespace Lucene.Net.Index { if (success) { - IOUtils.Close(@in); + IOUtils.Dispose(@in); } else { - IOUtils.CloseWhileHandlingException(@in); + IOUtils.DisposeWhileHandlingException(@in); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs index 3b5e738..1b0b02c 100644 --- a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs +++ b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs @@ -261,7 +261,7 @@ namespace Lucene.Net.Index Assert.AreEqual(1, GetValue(bdv1, 0, scratch)); Assert.AreEqual(10, GetValue(bdv2, 0, scratch)); - IOUtils.Close(writer, reader1, reader2, dir); + IOUtils.Dispose(writer, reader1, reader2, dir); } [Test] @@ -988,7 +988,7 @@ namespace Lucene.Net.Index // System.out.println(); } - IOUtils.Close(writer, reader, dir); + IOUtils.Dispose(writer, reader, dir); } [Test] @@ -1583,7 +1583,7 @@ namespace Lucene.Net.Index } reader_.Dispose(); - IOUtils.Close(dir1, dir2); + IOUtils.Dispose(dir1, dir2); } [Test] @@ -1852,7 +1852,7 @@ namespace Lucene.Net.Index } finally { - IOUtils.Close(indexReader, taxoReader, nFsd); + IOUtils.Dispose(indexReader, taxoReader, nFsd); } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs index f9aa9b3..5386ab4 100644 --- a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs +++ b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs @@ -904,11 +904,11 @@ namespace Lucene.Net.Index { if (success) { - IOUtils.Close(@in); + IOUtils.Dispose(@in); } else { - IOUtils.CloseWhileHandlingException(@in); + IOUtils.DisposeWhileHandlingException(@in); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs index 201bf33..827be36 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs @@ -1280,7 +1280,7 @@ namespace Lucene.Net.Index } finally { - IOUtils.CloseWhileHandlingException(r); + IOUtils.DisposeWhileHandlingException(r); } } if (i % 10 == 0) @@ -1379,7 +1379,7 @@ namespace Lucene.Net.Index } try { - IOUtils.Close(dir); + IOUtils.Dispose(dir); } catch (IOException e) { @@ -1387,7 +1387,7 @@ namespace Lucene.Net.Index } try { - IOUtils.Close(Adder); + IOUtils.Dispose(Adder); } catch (IOException e) { @@ -2589,7 +2589,7 @@ namespace Lucene.Net.Index } } Assert.IsTrue(liveIds.Count == 0); - IOUtils.Close(reader, w, dir); + IOUtils.Dispose(reader, w, dir); } private class RandomFailingFieldIterable : IEnumerable<IEnumerable<IIndexableField>> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestLongPostings.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestLongPostings.cs b/src/Lucene.Net.Tests/Index/TestLongPostings.cs index 68a9a6a..cd1eae7 100644 --- a/src/Lucene.Net.Tests/Index/TestLongPostings.cs +++ b/src/Lucene.Net.Tests/Index/TestLongPostings.cs @@ -94,7 +94,7 @@ namespace Lucene.Net.Index } finally { - IOUtils.CloseWhileHandlingException(priorException, ts); + IOUtils.DisposeWhileHandlingException(priorException, ts); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs index ddfd858..fe7225a 100644 --- a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs +++ b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs @@ -221,7 +221,7 @@ namespace Lucene.Net.Index // System.out.println(); } - IOUtils.Close(writer, reader, dir); + IOUtils.Dispose(writer, reader, dir); } [Test] http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs index 9a0dee7..455671c 100644 --- a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs +++ b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs @@ -222,7 +222,7 @@ namespace Lucene.Net.Index Assert.AreEqual(1, ((AtomicReader)reader1.Leaves[0].Reader).GetNumericDocValues("val").Get(0)); Assert.AreEqual(10, ((AtomicReader)reader2.Leaves[0].Reader).GetNumericDocValues("val").Get(0)); - IOUtils.Close(writer, reader1, reader2, dir); + IOUtils.Dispose(writer, reader1, reader2, dir); } [Test] @@ -938,7 +938,7 @@ namespace Lucene.Net.Index // System.out.println(); } - IOUtils.Close(writer, reader, dir); + IOUtils.Dispose(writer, reader, dir); } [Test] @@ -1499,7 +1499,7 @@ namespace Lucene.Net.Index } reader_.Dispose(); - IOUtils.Close(dir1, dir2); + IOUtils.Dispose(dir1, dir2); } [Test] http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs index 6eb23dc..4fc5676 100644 --- a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs +++ b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs @@ -560,11 +560,11 @@ namespace Lucene.Net.Index { if (success) { - IOUtils.Close(riw, dir); + IOUtils.Dispose(riw, dir); } else { - IOUtils.CloseWhileHandlingException(riw, dir); + IOUtils.DisposeWhileHandlingException(riw, dir); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs b/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs index ea79401..bef659b 100644 --- a/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs +++ b/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs @@ -211,7 +211,7 @@ namespace Lucene.Net.Index } finally { - IOUtils.CloseWhileHandlingException(priorException, stream); + IOUtils.DisposeWhileHandlingException(priorException, stream); } w.Dispose(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs b/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs index f92dd19..2948fd0 100644 --- a/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs +++ b/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs @@ -75,7 +75,7 @@ namespace Lucene.Net.Search [TearDown] public override void TearDown() { - IOUtils.Close(Iw, Ir, Dir); + IOUtils.Dispose(Iw, Ir, Dir); base.TearDown(); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs index 8ce1937..96c8be9 100644 --- a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs +++ b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs @@ -435,7 +435,7 @@ namespace Lucene.Net.Search } thread.Dispose(); thread.Join(); - IOUtils.Close(manager, _writer, d); + IOUtils.Dispose(manager, _writer, d); } private class ThreadAnonymousInnerClassHelper : ThreadClass http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs b/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs index ef34a8f..28b9649 100644 --- a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs @@ -505,7 +505,7 @@ namespace Lucene.Net.Search TopDocs search = searcher.Search(query, 10); Assert.AreEqual(totalDocsWithZero, search.TotalHits); - IOUtils.Close(reader, writer, directory); + IOUtils.Dispose(reader, writer, directory); } private class FilterAnonymousInnerClassHelper3 : Filter @@ -627,7 +627,7 @@ namespace Lucene.Net.Search TopDocs search = searcher.Search(query, 10); Assert.AreEqual(totalDocsWithZero, search.TotalHits); - IOUtils.Close(reader, writer, directory); + IOUtils.Dispose(reader, writer, directory); } private class FilterAnonymousInnerClassHelper4 : Filter http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs b/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs index c2456ba..31391ca 100644 --- a/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs +++ b/src/Lucene.Net.Tests/Search/TestIndexSearcher.cs @@ -138,7 +138,7 @@ namespace Lucene.Net.Search } finally { - IOUtils.Close(r, dir); + IOUtils.Dispose(r, dir); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs index b1dab24..fde7116 100644 --- a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs @@ -680,7 +680,7 @@ namespace Lucene.Net.Search } finally { - IOUtils.CloseWhileHandlingException(priorException, ts); + IOUtils.DisposeWhileHandlingException(priorException, ts); } } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Search/TestTermVectors.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Search/TestTermVectors.cs b/src/Lucene.Net.Tests/Search/TestTermVectors.cs index ae6939a..454aa02 100644 --- a/src/Lucene.Net.Tests/Search/TestTermVectors.cs +++ b/src/Lucene.Net.Tests/Search/TestTermVectors.cs @@ -248,7 +248,7 @@ namespace Lucene.Net.Search VerifyIndex(target); - IOUtils.Close(target, input[0], input[1]); + IOUtils.Dispose(target, input[0], input[1]); } [Test] @@ -273,7 +273,7 @@ namespace Lucene.Net.Search writer.Dispose(); VerifyIndex(target); - IOUtils.Close(target, input[0], input[1]); + IOUtils.Dispose(target, input[0], input[1]); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net.Tests/Util/TestIOUtils.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Util/TestIOUtils.cs b/src/Lucene.Net.Tests/Util/TestIOUtils.cs index 2f5ce7d..e27c9df 100644 --- a/src/Lucene.Net.Tests/Util/TestIOUtils.cs +++ b/src/Lucene.Net.Tests/Util/TestIOUtils.cs @@ -55,7 +55,7 @@ namespace Lucene.Net.Util try { TestException t = new TestException(); - IOUtils.CloseWhileHandlingException(t, new BrokenIDisposable(1), new BrokenIDisposable(2)); + IOUtils.DisposeWhileHandlingException(t, new BrokenIDisposable(1), new BrokenIDisposable(2)); } catch (TestException e1) { @@ -74,7 +74,7 @@ namespace Lucene.Net.Util // test without prior exception try { - IOUtils.CloseWhileHandlingException((TestException)null, new BrokenIDisposable(1), new BrokenIDisposable(2)); + IOUtils.DisposeWhileHandlingException((TestException)null, new BrokenIDisposable(1), new BrokenIDisposable(2)); } #pragma warning disable 168 catch (TestException e1) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs b/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs index b4a73bf..c141783 100644 --- a/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs +++ b/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs @@ -212,7 +212,7 @@ namespace Lucene.Net.Codecs if (!success) { // this.Dispose() will close in: - IOUtils.CloseWhileHandlingException(indexIn, this); + IOUtils.DisposeWhileHandlingException(indexIn, this); } } } @@ -272,7 +272,7 @@ namespace Lucene.Net.Codecs { try { - IOUtils.Close(@in, postingsReader); + IOUtils.Dispose(@in, postingsReader); } finally { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/BlockTreeTermsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Codecs/BlockTreeTermsWriter.cs b/src/Lucene.Net/Codecs/BlockTreeTermsWriter.cs index a0aafe4..3b1938c 100644 --- a/src/Lucene.Net/Codecs/BlockTreeTermsWriter.cs +++ b/src/Lucene.Net/Codecs/BlockTreeTermsWriter.cs @@ -326,7 +326,7 @@ namespace Lucene.Net.Codecs { if (!success) { - IOUtils.CloseWhileHandlingException(@out, indexOut); + IOUtils.DisposeWhileHandlingException(@out, indexOut); } } this.indexOut = indexOut; @@ -1240,7 +1240,7 @@ namespace Lucene.Net.Codecs } finally { - IOUtils.CloseWhileHandlingException(ioe, @out, indexOut, postingsWriter); + IOUtils.DisposeWhileHandlingException(ioe, @out, indexOut, postingsWriter); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs b/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs index b2fbb74..c82fffc 100644 --- a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs +++ b/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsReader.cs @@ -159,7 +159,7 @@ namespace Lucene.Net.Codecs.Compressing { if (!success) { - IOUtils.CloseWhileHandlingException(this, indexStream); + IOUtils.DisposeWhileHandlingException(this, indexStream); } } } @@ -180,7 +180,7 @@ namespace Lucene.Net.Codecs.Compressing { if (!closed) { - IOUtils.Close(fieldsStream); + IOUtils.Dispose(fieldsStream); closed = true; } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsWriter.cs b/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsWriter.cs index 465e1d1..879bb7a 100644 --- a/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsWriter.cs +++ b/src/Lucene.Net/Codecs/Compressing/CompressingStoredFieldsWriter.cs @@ -124,7 +124,7 @@ namespace Lucene.Net.Codecs.Compressing { if (!success) { - IOUtils.CloseWhileHandlingException(indexStream); + IOUtils.DisposeWhileHandlingException(indexStream); Abort(); } } @@ -136,7 +136,7 @@ namespace Lucene.Net.Codecs.Compressing { try { - IOUtils.Close(fieldsStream, indexWriter); + IOUtils.Dispose(fieldsStream, indexWriter); } finally { @@ -421,7 +421,7 @@ namespace Lucene.Net.Codecs.Compressing public override void Abort() { - IOUtils.CloseWhileHandlingException(this); + IOUtils.DisposeWhileHandlingException(this); IOUtils.DeleteFilesIgnoringExceptions(directory, IndexFileNames.SegmentFileName(segment, segmentSuffix, Lucene40StoredFieldsWriter.FIELDS_EXTENSION), IndexFileNames.SegmentFileName(segment, segmentSuffix, Lucene40StoredFieldsWriter.FIELDS_INDEX_EXTENSION)); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs b/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs index 5b69663..db6b99d 100644 --- a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs +++ b/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsReader.cs @@ -119,7 +119,7 @@ namespace Lucene.Net.Codecs.Compressing { if (!success) { - IOUtils.CloseWhileHandlingException(this, indexStream); + IOUtils.DisposeWhileHandlingException(this, indexStream); } } } @@ -188,7 +188,7 @@ namespace Lucene.Net.Codecs.Compressing { if (!closed) { - IOUtils.Close(vectorsStream); + IOUtils.Dispose(vectorsStream); closed = true; } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsWriter.cs b/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsWriter.cs index 2d23dbc..8155a9c 100644 --- a/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsWriter.cs +++ b/src/Lucene.Net/Codecs/Compressing/CompressingTermVectorsWriter.cs @@ -284,7 +284,7 @@ namespace Lucene.Net.Codecs.Compressing { if (!success) { - IOUtils.CloseWhileHandlingException(indexStream); + IOUtils.DisposeWhileHandlingException(indexStream); Abort(); } } @@ -296,7 +296,7 @@ namespace Lucene.Net.Codecs.Compressing { try { - IOUtils.Close(vectorsStream, indexWriter); + IOUtils.Dispose(vectorsStream, indexWriter); } finally { @@ -308,7 +308,7 @@ namespace Lucene.Net.Codecs.Compressing public override void Abort() { - IOUtils.CloseWhileHandlingException(this); + IOUtils.DisposeWhileHandlingException(this); IOUtils.DeleteFilesIgnoringExceptions(directory, IndexFileNames.SegmentFileName(segment, segmentSuffix, VECTORS_EXTENSION), IndexFileNames.SegmentFileName(segment, segmentSuffix, VECTORS_INDEX_EXTENSION)); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs index 3e3d0ac..df4b09f 100644 --- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs +++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFieldInfosReader.cs @@ -142,7 +142,7 @@ namespace Lucene.Net.Codecs.Lucene3x } else { - IOUtils.CloseWhileHandlingException(input); + IOUtils.DisposeWhileHandlingException(input); } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs index 81aae0d..a98f2f1 100644 --- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs +++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xFields.cs @@ -199,7 +199,7 @@ namespace Lucene.Net.Codecs.Lucene3x { if (disposing) { - IOUtils.Close(Tis, TisNoIndex, /*cfsReader,*/ FreqStream, ProxStream); // LUCENENET NOTE: cfsReader not used + IOUtils.Dispose(Tis, TisNoIndex, /*cfsReader,*/ FreqStream, ProxStream); // LUCENENET NOTE: cfsReader not used } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xNormsProducer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xNormsProducer.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xNormsProducer.cs index ed32a6f..b689f47 100644 --- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xNormsProducer.cs +++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xNormsProducer.cs @@ -141,7 +141,7 @@ namespace Lucene.Net.Codecs.Lucene3x { if (!success) { - IOUtils.CloseWhileHandlingException(openFiles); + IOUtils.DisposeWhileHandlingException(openFiles); } } ramBytesUsed = new AtomicInt64(); @@ -153,7 +153,7 @@ namespace Lucene.Net.Codecs.Lucene3x { try { - IOUtils.Close(openFiles.ToArray()); + IOUtils.Dispose(openFiles.ToArray()); } finally { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7842db8a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xSegmentInfoReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xSegmentInfoReader.cs b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xSegmentInfoReader.cs index 2e4b015..8b721f1 100644 --- a/src/Lucene.Net/Codecs/Lucene3x/Lucene3xSegmentInfoReader.cs +++ b/src/Lucene.Net/Codecs/Lucene3x/Lucene3xSegmentInfoReader.cs @@ -121,7 +121,7 @@ namespace Lucene.Net.Codecs.Lucene3x { if (!success) { - IOUtils.CloseWhileHandlingException(input); + IOUtils.DisposeWhileHandlingException(input); } else {
