Fix for race bug in WSMan command plugin instance close operation (PowerShell#3203)

PaulHigin · daxian-dbw · commit 136213d6b476 · 2017-02-27T15:15:58.000-08:00
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManPlugin.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManPlugin.cs
@@ -473,15 +473,13 @@ internal void CloseShellOperation(
                 return;
             }
 
-            SetThreadProperties(mgdShellSession.creationRequestDetails);
             // update the internal data store only if this is not receive operation.
             if (!context.isReceiveOperation)
             {
                 DeleteFromActiveShellSessions(context.shellContext);
             }
 
-            string errorMsg = StringUtil.Format(RemotingErrorIdStrings.WSManPluginOperationClose);
-            System.Exception reasonForClose = new System.Exception(errorMsg);
+            System.Exception reasonForClose = new System.Exception(RemotingErrorIdStrings.WSManPluginOperationClose);
             mgdShellSession.CloseOperation(context, reasonForClose);
         }
 
@@ -502,7 +500,7 @@ internal void CloseCommandOperation(
                 //Dbg.Assert(false, "context.shellContext not matched");
                 return;
             }
-            SetThreadProperties(mgdShellSession.creationRequestDetails);
+
             mgdShellSession.CloseCommandOperation(context);
         }
 
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginShellSession.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginShellSession.cs
@@ -698,6 +698,8 @@ internal override void CloseOperation(
                 }
             }
 
+            WSManPluginInstance.SetThreadProperties(creationRequestDetails);
+
             bool isRcvOpShuttingDown = (context.isShuttingDown) && (context.isReceiveOperation);
             bool isRcvOp = context.isReceiveOperation;
             bool isShuttingDown = context.isShuttingDown;
@@ -797,6 +799,8 @@ internal override void CloseOperation(
                 }
             }
 
+            WSManPluginInstance.SetThreadProperties(creationRequestDetails);
+
             bool isRcvOp = context.isReceiveOperation;
             // only one thread will be here.
             bool isRcvOpShuttingDown = (context.isShuttingDown) &&

Original file line number	Diff line number	Diff line change
`@@ -473,15 +473,13 @@ internal void CloseShellOperation(`
`473`	`473`	`return;`
`474`	`474`	`}`
`475`	`475`
`476`		`- SetThreadProperties(mgdShellSession.creationRequestDetails);`
`477`	`476`	`// update the internal data store only if this is not receive operation.`
`478`	`477`	`if (!context.isReceiveOperation)`
`479`	`478`	`{`
`480`	`479`	`DeleteFromActiveShellSessions(context.shellContext);`
`481`	`480`	`}`
`482`	`481`
`483`		`- string errorMsg = StringUtil.Format(RemotingErrorIdStrings.WSManPluginOperationClose);`
`484`		`- System.Exception reasonForClose = new System.Exception(errorMsg);`
	`482`	`+ System.Exception reasonForClose = new System.Exception(RemotingErrorIdStrings.WSManPluginOperationClose);`
`485`	`483`	`mgdShellSession.CloseOperation(context, reasonForClose);`
`486`	`484`	`}`
`487`	`485`
`@@ -502,7 +500,7 @@ internal void CloseCommandOperation(`
`502`	`500`	`//Dbg.Assert(false, "context.shellContext not matched");`
`503`	`501`	`return;`
`504`	`502`	`}`
`505`		`- SetThreadProperties(mgdShellSession.creationRequestDetails);`
	`503`	`+`
`506`	`504`	`mgdShellSession.CloseCommandOperation(context);`
`507`	`505`	`}`
`508`	`506`
Original file line number	Diff line number	Diff line change
`@@ -698,6 +698,8 @@ internal override void CloseOperation(`
`698`	`698`	`}`
`699`	`699`	`}`
`700`	`700`
	`701`	`+ WSManPluginInstance.SetThreadProperties(creationRequestDetails);`
	`702`	`+`
`701`	`703`	`bool isRcvOpShuttingDown = (context.isShuttingDown) && (context.isReceiveOperation);`
`702`	`704`	`bool isRcvOp = context.isReceiveOperation;`
`703`	`705`	`bool isShuttingDown = context.isShuttingDown;`
`@@ -797,6 +799,8 @@ internal override void CloseOperation(`
`797`	`799`	`}`
`798`	`800`	`}`
`799`	`801`
	`802`	`+ WSManPluginInstance.SetThreadProperties(creationRequestDetails);`
	`803`	`+`
`800`	`804`	`bool isRcvOp = context.isReceiveOperation;`
`801`	`805`	`// only one thread will be here.`
`802`	`806`	`bool isRcvOpShuttingDown = (context.isShuttingDown) &&`