Dispose IndexSearcher's underlying IndexReader when reloading/disposing context.

Author: chriseldredge

Ciao.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Bootstrap" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup Label="Version">
-        <VersionPrefix>3.3.2</VersionPrefix>
+        <VersionPrefix>3.3.3</VersionPrefix>
         <VersionSuffix></VersionSuffix>
     </PropertyGroup>
 

source/Lucene.Net.Linq.Tests/ContextTests.cs

@@ -123,6 +123,26 @@ public void ReloadDisposesSearcher()
             searcher.AssertWasCalled(s => s.Dispose());
         }
 
+        [Test]
+        public void DisposeDisposesSearcher()
+        {
+            var searcher = context.CurrentTracker.Searcher;
+
+            context.Dispose();
+
+            searcher.AssertWasCalled(s => s.Dispose());
+        }
+
+        [Test]
+        public void DisposeDisposesSearcherReader()
+        {
+            context.CurrentTracker.Searcher.Dispose();
+            
+            context.Dispose();
+
+            context.FakeReader.AssertWasCalled(r => r.Dispose());
+        }
+
         [Test]
         public void ReloadFiresLoadingEvent()
         {
@@ -269,4 +289,4 @@ public bool IsClosed
             }
         }
     }
-}
+}

source/Lucene.Net.Linq.Tests/Integration/AllowSpecialCharactersTests.cs

@@ -84,4 +84,4 @@ public class PathDocument
             public string Name { get; set; }
         }
     }
-}
+}

source/Lucene.Net.Linq.Tests/Integration/ReleaseTests.cs

@@ -0,0 +1,40 @@
+using System;
+using System.IO;
+using System.Linq;
+using Lucene.Net.Store;
+using NUnit.Framework;
+using Version = Lucene.Net.Util.Version;
+
+namespace Lucene.Net.Linq.Tests.Integration
+{
+    [TestFixture]
+    public class ReleaseTests
+    {
+        public class Document
+        {
+            public int Id { get; set; }
+        }
+
+        [Test]
+        public void CommitInSessionAndDisposeProviderReleasesFiles()
+        {
+            var dir = "index." + DateTime.Now.Ticks;
+            System.IO.Directory.CreateDirectory(dir);
+            var provider = new LuceneDataProvider(FSDirectory.Open(dir), Version.LUCENE_30);
+            using (provider)
+            {
+                using (var session = provider.OpenSession<Document>())
+                {
+                    session.Add(new Document { Id = 1 });
+
+                    session.Commit();
+
+                    session.Add(new Document { Id = 2 });
+                }
+            }
+
+            TestDelegate call = () => System.IO.Directory.Delete(dir, true);
+            Assert.That(call, Throws.Nothing);
+        }
+    }
+}

source/Lucene.Net.Linq.Tests/Lucene.Net.Linq.Tests.csproj

@@ -121,6 +121,7 @@
     <Compile Include="Integration\OrderByTests.cs" />
     <Compile Include="Integration\PorterStemAnalyzer.cs" />
     <Compile Include="Integration\RangeTests.cs" />
+    <Compile Include="Integration\ReleaseTests.cs" />
     <Compile Include="Integration\StatisticTests.cs" />
     <Compile Include="LuceneQueryExecutorTests.cs" />
     <Compile Include="Mapping\FieldMappingInfoBuilderSortFieldTests.cs" />

source/Lucene.Net.Linq/Context.cs

@@ -80,7 +80,7 @@ public virtual void Reload()
                     searcher = CreateSearcher();
                     reader = searcher.IndexReader;
                 }
-                else if (!ReopenSearcher(out searcher)) 
+                else if (!ReopenSearcher(out searcher))
                 {
                     return;
                 }
@@ -252,7 +252,11 @@ public bool TryDispose()
                             undisposedTrackers.Remove(this);
                         }
 
+                        var reader = searcher.IndexReader;
                         searcher.Dispose();
+                        // NB IndexSearcher.Dispose() does not Dispose externally provided IndexReader:
+                        reader.Dispose();
+
                         disposed = true;
                     }
                     else
@@ -284,4 +288,4 @@ internal interface ISearcherHandle : IDisposable
         IndexSearcher Searcher { get; }
     }
 
-}
+}

source/Lucene.Net.Linq/LuceneSession.cs

@@ -351,4 +351,4 @@ public void Clear()
             }
         }
     }
-}
+}