admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix race condition exception on recent change to OutOfProc transport (#11406)

Browse Source
This commit is contained in:
Paul Higinbotham
2019-12-20 13:20:10 -08:00
committed by Andrew
parent e81bd1dfda
commit e58ebfa6b4
1 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
+38 -12
View File
@@ -628,7 +628,29 @@ namespace System.Management.Automation.Remoting.Client
{
_cmdTransportManagers.Clear();
_closeTimeOutTimer.Dispose();
// Stop session processing thread.
try
{
_sessionMessageQueue.CompleteAdding();
}
catch (ObjectDisposedException)
{
// Object already disposed.
}
_sessionMessageQueue.Dispose();
// Stop command processing thread.
try
{
_commandMessageQueue.CompleteAdding();
}
catch (ObjectDisposedException)
{
// Object already disposed.
}
_commandMessageQueue.Dispose();
}
}
@@ -683,10 +705,6 @@ namespace System.Management.Automation.Remoting.Client
// stop timer
_closeTimeOutTimer.Change(Timeout.Infinite, Timeout.Infinite);
// Stop protocol message processing threads.
_sessionMessageQueue.CompleteAdding();
_commandMessageQueue.CompleteAdding();
RaiseCloseCompleted();
CleanupConnection();
}
@@ -753,17 +771,25 @@ namespace System.Management.Automation.Remoting.Client
protected void HandleOutputDataReceived(string data)
{
// Route protocol message based on whether it is a session or command message.
// Session messages have empty Guid values.
if (Guid.Equals(GetMessageGuid(data), Guid.Empty))
try
{
// Session message
_sessionMessageQueue.Add(data);
// Route protocol message based on whether it is a session or command message.
// Session messages have empty Guid values.
if (Guid.Equals(GetMessageGuid(data), Guid.Empty))
{
// Session message
_sessionMessageQueue.Add(data);
}
else
{
// Command message
_commandMessageQueue.Add(data);
}
}
else
catch (InvalidOperationException)
{
// Command message
_commandMessageQueue.Add(data);
// This exception will be thrown by the BlockingCollection message queue objects
// after they have been closed.
}
}