Skip to content
This repository was archived by the owner on Oct 4, 2021. It is now read-only.

Fixes VSTS Bug 985666: [FATAL] SigAbrt exception in #9068

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixes VSTS Bug 985666: [FATAL] SigAbrt exception in #9068

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53e2bc4
Fixes VSTS Bug 985666: [FATAL] SigAbrt exception in
mkrueger Oct 24, 2019
a72a3c2
[VersionControl] Added an disposed check to DedicatedOperationFactory
mkrueger Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions ...ionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ DedicatedThreadScheduler GitScheduler {

TaskFactory DedicatedOperationFactory {
get {
if (rootRepository == null)
throw new ObjectDisposedException ("This object is disposed.");
if (dedicatedOperationFactory == null)
dedicatedOperationFactory = new TaskFactory (GitScheduler);
return dedicatedOperationFactory;
Expand Down Expand Up @@ -285,6 +287,7 @@ void ThawEvents ()
FileService.ThawEvents ();
}

object repositoryDisposeLock = new object ();
protected override void Dispose (bool disposing)
{
if (IsDisposed)
Expand All @@ -296,20 +299,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 ();
Expand All @@ -322,8 +329,6 @@ protected override void Dispose (bool disposing)
base.Dispose (disposing);

watcher = null;
rootRepository = null;
cachedSubmodules = null;
}

public override string[] SupportedProtocols {
Expand Down