Fix PowerShellCmdlet (#4247)

msftrubengu · web-flow · commit 8a006549c4aa · 2024-03-06T17:50:00.000-08:00
diff --git a/src/PowerShell/CommonFiles/PowerShellCmdlet.cs b/src/PowerShell/CommonFiles/PowerShellCmdlet.cs
@@ -1,4 +1,4 @@
-﻿// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // <copyright file="PowerShellCmdlet.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. Licensed under the MIT License.
 // </copyright>
@@ -281,6 +281,7 @@ internal void Wait(Task runningTask, PowerShellCmdlet? writeCmdlet = null)
                     {
                         try
                         {
+                            this.pwshThreadEdi = null;
                             this.pwshThreadAction();
                         }
                         catch (Exception e)
@@ -596,12 +597,17 @@ private void WaitMainThreadActionCompletion()
                 this.pwshThreadActionCompleted.WaitHandle,
             });
 
-            if (this.pwshThreadEdi != null)
+            try
             {
-                this.pwshThreadEdi.Throw();
+                if (this.pwshThreadEdi != null)
+                {
+                    this.pwshThreadEdi.Throw();
+                }
+            }
+            finally
+            {
+                this.semaphore.Release();
             }
-
-            this.semaphore.Release();
         }
 
         private class QueuedStream

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// -----------------------------------------------------------------------------`
	`1`	`+// -----------------------------------------------------------------------------`
`2`	`2`	`// <copyright file="PowerShellCmdlet.cs" company="Microsoft Corporation">`
`3`	`3`	`// Copyright (c) Microsoft Corporation. Licensed under the MIT License.`
`4`	`4`	`// </copyright>`
`@@ -281,6 +281,7 @@ internal void Wait(Task runningTask, PowerShellCmdlet? writeCmdlet = null)`
`281`	`281`	`{`
`282`	`282`	`try`
`283`	`283`	`{`
	`284`	`+ this.pwshThreadEdi = null;`
`284`	`285`	`this.pwshThreadAction();`
`285`	`286`	`}`
`286`	`287`	`catch (Exception e)`
`@@ -596,12 +597,17 @@ private void WaitMainThreadActionCompletion()`
`596`	`597`	`this.pwshThreadActionCompleted.WaitHandle,`
`597`	`598`	`});`
`598`	`599`
`599`		`- if (this.pwshThreadEdi != null)`
	`600`	`+ try`
`600`	`601`	`{`
`601`		`- this.pwshThreadEdi.Throw();`
	`602`	`+ if (this.pwshThreadEdi != null)`
	`603`	`+ {`
	`604`	`+ this.pwshThreadEdi.Throw();`
	`605`	`+ }`
	`606`	`+ }`
	`607`	`+ finally`
	`608`	`+ {`
	`609`	`+ this.semaphore.Release();`
`602`	`610`	`}`
`603`		`-`
`604`		`- this.semaphore.Release();`
`605`	`611`	`}`
`606`	`612`
`607`	`613`	`private class QueuedStream`