Fix the Threading Issue in GitEventsMonitor (#5019)

Fixes #5020
SonarSource · Nov 15, 2023 · dbf2515 · dbf2515
1 parent af16f6b
commit dbf2515
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Core.UnitTests/GitEventsMonitorTests.cs b/src/Core.UnitTests/GitEventsMonitorTests.cs
@@ -20,6 +20,8 @@
 
 using System;
 using System.IO.Abstractions;
+using System.Threading.Tasks;
+using System.Windows.Threading;
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -46,6 +48,8 @@ public void HeadChanged_EventInvoked()
 
             fileSystemWatcher.Raise(w => w.Renamed += null, null, null);
 
+            Dispatcher.CurrentDispatcher.Invoke(() => { }); // Force thread dispatcher to process other threads
+
             counter.Should().Be(1);
         }
 

diff --git a/src/Core/GitEventsMonitor.cs b/src/Core/GitEventsMonitor.cs
@@ -44,10 +44,8 @@ public sealed class GitEventsMonitor : IGitEvents, IDisposable
         private const string GitFolder = ".git";
         private const string HEADFile = "HEAD";
 
-
         public GitEventsMonitor(string repoFolder) : this(repoFolder, new FileSystemWatcherFactory())
         {
-
         }
 
         internal GitEventsMonitor(string repoFolder, IFileSystemWatcherFactory fileSystemFactory)
@@ -73,7 +71,10 @@ private void WatchGitEvents(string repoFolder, IFileSystemWatcherFactory fileSys
 
         private void HeadFileChanged(object sender, FileSystemEventArgs e)
         {
-            HeadChanged?.Invoke(this, EventArgs.Empty);
+            HeadChanged?.BeginInvoke(this, EventArgs.Empty, new AsyncCallback((IAsyncResult ar) =>
+            {
+                HeadChanged?.EndInvoke(ar);
+            }), null);
         }
 
         public void Dispose()