Address feedback, disable a test on Mono, slightly simplify same test (avoid two...

diff --git a/src/coreclr/src/pal/src/synchobj/mutex.cpp b/src/coreclr/src/pal/src/synchobj/mutex.cpp
index 6c90ab4..d36752a 100644 (file)
--- a/src/coreclr/src/pal/src/synchobj/mutex.cpp
+++ b/src/coreclr/src/pal/src/synchobj/mutex.cpp
@@ -1632,19 +1632,14 @@ void NamedMutexProcessData::Abandon()
     _ASSERTE(IsLockOwnedByCurrentThread());
     _ASSERTE(m_lockCount != 0);
 
-    bool hasRefFromLockOwnerThread = m_hasRefFromLockOwnerThread;
-    if (hasRefFromLockOwnerThread)
-    {
-        m_hasRefFromLockOwnerThread = false;
-    }
-
     sharedData->SetIsAbandoned(true);
     m_lockCount = 0;
     SetLockOwnerThread(nullptr);
     ActuallyReleaseLock();
 
-    if (hasRefFromLockOwnerThread)
+    if (m_hasRefFromLockOwnerThread)
     {
+        m_hasRefFromLockOwnerThread = false;
         m_processDataHeader->DecRefCount();
     }
 }

diff --git a/src/libraries/System.Threading/tests/MutexTests.cs b/src/libraries/System.Threading/tests/MutexTests.cs
index e5143a4..1557a24 100644 (file)
--- a/src/libraries/System.Threading/tests/MutexTests.cs
+++ b/src/libraries/System.Threading/tests/MutexTests.cs
@@ -394,14 +394,14 @@ namespace System.Threading.Tests
 
         public static IEnumerable<object[]> CrossProcess_NamedMutex_ProtectedFileAccessAtomic_MemberData()
         {
-            var nameGuidStr = Guid.NewGuid().ToString("N");
             foreach (var namePrefix in GetNamePrefixes())
             {
-                yield return new object[] { namePrefix + nameGuidStr };
+                yield return new object[] { namePrefix };
             }
         }
 
         [Theory]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/36307", TestRuntimes.Mono)]
         [MemberData(nameof(CrossProcess_NamedMutex_ProtectedFileAccessAtomic_MemberData))]
         public void CrossProcess_NamedMutex_ProtectedFileAccessAtomic(string prefix)
         {