From 7806c5cd4302e27aac0a3bbcd3da176c5a0977ba Mon Sep 17 00:00:00 2001 From: zacharylayne Date: Tue, 27 Dec 2022 04:34:02 -0800 Subject: [PATCH 1/2] Update sample.cs - Fix first if-statement in Create method: currently checks to see if `nameValue == null` **and** `nameValue.Length == 0`. Should check if one or the other. - Change exception thrown from above if-statement from `ArgumentNullException` to `ArgumentException` and replaced argument with `nameof` expression. - Remove unnecessary empty lines. --- .../SafeWaitHandle/Overview/sample.cs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/snippets/csharp/Microsoft.Win32.SafeHandles/SafeWaitHandle/Overview/sample.cs b/snippets/csharp/Microsoft.Win32.SafeHandles/SafeWaitHandle/Overview/sample.cs index 29beb85b7dd..d58f1040db0 100644 --- a/snippets/csharp/Microsoft.Win32.SafeHandles/SafeWaitHandle/Overview/sample.cs +++ b/snippets/csharp/Microsoft.Win32.SafeHandles/SafeWaitHandle/Overview/sample.cs @@ -5,14 +5,12 @@ class SafeHandlesExample { - static void Main() { UnmanagedMutex uMutex = new UnmanagedMutex("YourCompanyName_SafeHandlesExample_MUTEX"); try { - uMutex.Create(); Console.WriteLine("Mutex created. Press Enter to release it."); Console.ReadLine(); @@ -58,10 +56,8 @@ public UnmanagedMutex(string Name) public void Create() { - if (nameValue == null && nameValue.Length == 0) - { - throw new ArgumentNullException("nameValue"); - } + if (nameValue == null || nameValue.Length == 0) + throw new ArgumentException(nameof(nameValue)); handleValue = CreateMutex(mutexAttrValue, true, nameValue); @@ -105,4 +101,4 @@ public void Release() ReleaseMutex(handleValue); } } -// \ No newline at end of file +// From 8d1bdc5ba1f179f56c156ec4216ec055d36f0a16 Mon Sep 17 00:00:00 2001 From: Genevieve Warren <24882762+gewarren@users.noreply.github.com> Date: Wed, 28 Aug 2024 17:27:46 -0700 Subject: [PATCH 2/2] Apply suggestions from code review --- .../SafeWaitHandle/Overview/sample.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/snippets/csharp/Microsoft.Win32.SafeHandles/SafeWaitHandle/Overview/sample.cs b/snippets/csharp/Microsoft.Win32.SafeHandles/SafeWaitHandle/Overview/sample.cs index d58f1040db0..14239f863b2 100644 --- a/snippets/csharp/Microsoft.Win32.SafeHandles/SafeWaitHandle/Overview/sample.cs +++ b/snippets/csharp/Microsoft.Win32.SafeHandles/SafeWaitHandle/Overview/sample.cs @@ -56,8 +56,7 @@ public UnmanagedMutex(string Name) public void Create() { - if (nameValue == null || nameValue.Length == 0) - throw new ArgumentException(nameof(nameValue)); + ArgumentException.ThrowIfNullOrEmpty(nameValue); handleValue = CreateMutex(mutexAttrValue, true, nameValue);