Fixes VSTS Bug 985666: [FATAL] SigAbrt exception in

LibGit2Sharp.dll!LibGit2Sharp.Core.Handles.RepositoryHandle::Free+0 https://devdiv.visualstudio.com/DevDiv/_workitems/edit/985666
mono · Oct 24, 2019 · 18f1f13 · 18f1f13
1 parent 3d42df3
commit 18f1f13
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/...ionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs b/...ionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
@@ -285,6 +285,7 @@ void ThawEvents ()
 			FileService.ThawEvents ();
 		}
 
+		object repositoryDisposeLock = new object ();
 		protected override void Dispose (bool disposing)
 		{
 			if (IsDisposed)
@@ -296,20 +297,24 @@ protected override void Dispose (bool disposing)
 				gitLock?.Dispose ();
 				if (rootRepository != null) {
 					DedicatedOperationFactory.StartNew (() => {
-						try {
-							rootRepository?.Dispose ();
-						} catch (Exception e) {
-							LoggingService.LogInternalError ("Disposing LibGit2Sharp.Repository failed", e);
-						}
-						if (cachedSubmodules != null) {
-							foreach (var submodule in cachedSubmodules) {
-								if (submodule?.Item2 != null) {
-									try {
-										submodule?.Item2.Dispose ();
-									} catch (Exception e) {
-										LoggingService.LogInternalError ("Disposing LibGit2Sharp.Repository failed", e);
+						lock (repositoryDisposeLock) {
+							try {
+								rootRepository?.Dispose ();
+								rootRepository = null;
+							} catch (Exception e) {
+								LoggingService.LogInternalError ("Disposing LibGit2Sharp.Repository failed", e);
+							}
+							if (cachedSubmodules != null) {
+								foreach (var submodule in cachedSubmodules) {
+									if (submodule?.Item2 != null) {
+										try {
+											submodule?.Item2.Dispose ();
+										} catch (Exception e) {
+											LoggingService.LogInternalError ("Disposing LibGit2Sharp.Repository failed", e);
+										}
 									}
 								}
+								cachedSubmodules = null;
 							}
 						}
 					}).Wait ();
@@ -322,8 +327,6 @@ protected override void Dispose (bool disposing)
 			base.Dispose (disposing);
 
 			watcher = null;
-			rootRepository = null;
-			cachedSubmodules = null;
 		}
 
 		public override string[] SupportedProtocols {