apfunk
diff --git a/‎LibGit2Sharp.Tests/OdbBackendFixture.cs
Lines changed: 41 additions & 1 deletion b/‎LibGit2Sharp.Tests/OdbBackendFixture.cs
Lines changed: 41 additions & 1 deletion
diff --git a/‎LibGit2Sharp/ObjectDatabase.cs
Lines changed: 4 additions & 0 deletions b/‎LibGit2Sharp/ObjectDatabase.cs
Lines changed: 4 additions & 0 deletions
diff --git a/‎LibGit2Sharp/OdbBackend.cs
Lines changed: 21 additions & 6 deletions b/‎LibGit2Sharp/OdbBackend.cs
Lines changed: 21 additions & 6 deletions
@@ -221,10 +221,48 @@ private static Blob CreateBlob(Repository repo, string content)
             }
         }
 
+        [Fact]
+        public void ADisposableOdbBackendGetsDisposedUponRepositoryDisposal()
+        {
+            string path = InitNewRepository();
+
+            int nbOfDisposeCalls = 0;
+
+            using (var repo = new Repository(path))
+            {
+                var mockOdbBackend = new MockOdbBackend(() => { nbOfDisposeCalls++; });
+
+                Assert.IsAssi
8000
gnableFrom<IDisposable>(mockOdbBackend);
+
+                repo.ObjectDatabase.AddBackend(mockOdbBackend, 5);
+
+                Assert.Equal(0, nbOfDisposeCalls);
+            }
+
+            Assert.Equal(1, nbOfDisposeCalls);
+        }
+
         #region MockOdbBackend
 
-        private class MockOdbBackend : OdbBackend
+        private class MockOdbBackend : OdbBackend, IDisposable
         {
+            public MockOdbBackend(Action disposer = null)
+            {
+                this.disposer = disposer;
+            }
+
+            public void Dispose()
+            {
+                if (disposer == null)
+                {
+                    return;
+                }
+
+                disposer();
+
+                disposer = null;
+            }
+
             protected override OdbBackendOperations SupportedOperations
             {
                 get
@@ -398,6 +436,8 @@ public override int ReadHeader(ObjectId oid, out int length, out ObjectType obje
             private readonly Dictionary<ObjectId, MockGitObject> m_objectIdToContent =
                 new Dictionary<ObjectId, MockGitObject>();
 
+            private Action disposer;
+
             #region Unimplemented
 
             public override int ReadStream(ObjectId oid, out OdbBackendStream stream)
 
@@ -99,6 +99,10 @@ public virtual Blob CreateBlob(string path)
 
         /// <summary>
         /// Adds the provided backend to the object database with the specified priority.
+        /// <para>
+        /// If the provided backend implements <see cref="IDisposable"/>, the <see cref="IDisposable.Dispose"/>
+        /// method will be honored and invoked upon the disposal of the repository.
+        /// </para>
         /// </summary>
         /// <param name="backend">The backend to add</param>
         /// <param name="priority">The priority at which libgit2 should consult this backend (higher values are consulted first)</param>
 
@@ -8,20 +8,26 @@ namespace LibGit2Sharp
 {
     /// <summary>
     /// Base class for all custom managed backends for the libgit2 object database (ODB).
+    /// <para>
+    /// If the derived backend implements <see cref="IDisposable"/>, the <see cref="IDisposable.Dispose"/>
+    /// method will be honored and invoked upon the disposal of the repository.
+    /// </para>
     /// </summary>
     public abstract class OdbBackend
     {
         /// <summary>
         /// Invoked by libgit2 when this backend is no longer needed.
         /// </summary>
-        protected virtual void Dispose()
+        internal void Free()
         {
-            if (IntPtr.Zero != nativeBackendPointer)
+            if (nativeBackendPointer == IntPtr.Zero)
             {
-                GCHandle.FromIntPtr(Marshal.ReadIntPtr(nativeBackendPointer, GitOdbBackend.GCHandleOffset)).Free();
-                Marshal.FreeHGlobal(nativeBackendPointer);
-                nativeBackendPointer = IntPtr.Zero;
+                return;
             }
+
+            GCHandle.FromIntPtr(Marshal.ReadIntPtr(nativeBackendPointer, GitOdbBackend.GCHandleOffset)).Free();
+            Marshal.FreeHGlobal(nativeBackendPointer);
+            nativeBackendPointer = IntPtr.Zero;
         }
 
         /// <summary>
@@ -588,7 +594,16 @@ private static void Free(
 
                 try
                 {
-                    odbBackend.Dispose();
+                    odbBackend.Free();
+
+                    var disposable = odbBackend as IDisposable;
+
+                    if (disposable == null)
+                    {
+                        return;
+                    }
+
+                    disposable.Dispose();
                 }
                 catch (Exception ex)
                 {
Original file line number	Diff line number	Diff line change
`@@ -8,20 +8,26 @@ namespace LibGit2Sharp`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// Base class for all custom managed backends for the libgit2 object database (ODB).`
	`11`	`+ /// <para>`
	`12`	`+ /// If the derived backend implements <see cref="IDisposable"/>, the <see cref="IDisposable.Dispose"/>`
	`13`	`+ /// method will be honored and invoked upon the disposal of the repository.`
	`14`	`+ /// </para>`
`11`	`15`	`/// </summary>`
`12`	`16`	`public abstract class OdbBackend`
`13`	`17`	`{`
`14`	`18`	`/// <summary>`
`15`	`19`	`/// Invoked by libgit2 when this backend is no longer needed.`
`16`	`20`	`/// </summary>`
`17`		`- protected virtual void Dispose()`
	`21`	`+ internal void Free()`
`18`	`22`	`{`
`19`		`- if (IntPtr.Zero != nativeBackendPointer)`
	`23`	`+ if (nativeBackendPointer == IntPtr.Zero)`
`20`	`24`	`{`
`21`		`- GCHandle.FromIntPtr(Marshal.ReadIntPtr(nativeBackendPointer, GitOdbBackend.GCHandleOffset)).Free();`
`22`		`- Marshal.FreeHGlobal(nativeBackendPointer);`
`23`		`- nativeBackendPointer = IntPtr.Zero;`
	`25`	`+ return;`
`24`	`26`	`}`
	`27`	`+`
	`28`	`+ GCHandle.FromIntPtr(Marshal.ReadIntPtr(nativeBackendPointer, GitOdbBackend.GCHandleOffset)).Free();`
	`29`	`+ Marshal.FreeHGlobal(nativeBackendPointer);`
	`30`	`+ nativeBackendPointer = IntPtr.Zero;`
`25`	`31`	`}`
`26`	`32`
`27`	`33`	`/// <summary>`
`@@ -588,7 +594,16 @@ private static void Free(`
`588`	`594`
`589`	`595`	`try`
`590`	`596`	`{`
`591`		`- odbBackend.Dispose();`
	`597`	`+ odbBackend.Free();`
	`598`	`+`
	`599`	`+ var disposable = odbBackend as IDisposable;`
	`600`	`+`
	`601`	`+ if (disposable == null)`
	`602`	`+ {`
	`603`	`+ return;`
	`604`	`+ }`
	`605`	`+`
	`606`	`+ disposable.Dispose();`
`592`	`607`	`}`
`593`	`608`	`catch (Exception ex)`
`594`	`609`	`{`