Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anmenaga merged 3 commits into from
Dec 20, 2019
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1df23fb
Fix race condition exception on recent change to OutOfProc transport …
PaulHigin Dec 19, 2019
3498697
Fix CodFactor issues
PaulHigin Dec 19, 2019
9748307
Fix CodeFactor issues
PaulHigin Dec 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 38 additions & 12 deletions src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,29 @@ internal override void Dispose(bool isDisposing)
{
_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();
}
}
Expand Down Expand Up @@ -683,10 +705,6 @@ private void OnCloseSessionCompleted()
// stop timer
_closeTimeOutTimer.Change(Timeout.Infinite, Timeout.Infinite);

// Stop protocol message processing threads.
_sessionMessageQueue.CompleteAdding();
_commandMessageQueue.CompleteAdding();

RaiseCloseCompleted();
CleanupConnection();
}
Expand Down Expand Up @@ -753,17 +771,25 @@ private Guid GetMessageGuid(string data)

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.
}
}

Expand Down