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

Porting random hang fixes (#5258)

Browse Source
This commit is contained in:
Paul Higinbotham
2017-11-09 16:22:39 -08:00
committed by Aditya Patwardhan
parent e0ee555ad6
commit 73188ce27a
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/System.Management.Automation/engine/remoting/client/Job.cs
+19 -8
View File
@@ -1542,14 +1542,25 @@ namespace System.Management.Automation
/// </summary>
internal void CloseAllStreams()
{
if (_resultsOwner) _results.Complete();
if (_outputOwner) _output.Complete();
if (_errorOwner) _error.Complete();
if (_progressOwner) _progress.Complete();
if (_verboseOwner) _verbose.Complete();
if (_warningOwner) _warning.Complete();
if (_debugOwner) _debug.Complete();
if (_informationOwner) _information.Complete();
// The Complete() method includes raising public notification events that third parties can
// handle and potentially throw exceptions on the notification thread. We don't want to
// propagate those exceptions because it prevents this thread from completing its processing.
if (_resultsOwner) { try { _results.Complete(); } catch (Exception e) { TraceException(e); } }
if (_outputOwner) { try { _output.Complete(); } catch (Exception e) { TraceException(e); } }
if (_errorOwner) { try { _error.Complete(); } catch (Exception e) { TraceException(e); } }
if (_progressOwner) { try { _progress.Complete(); } catch (Exception e) { TraceException(e); } }
if (_verboseOwner) { try { _verbose.Complete(); } catch (Exception e) { TraceException(e); } }
if (_warningOwner) { try { _warning.Complete(); } catch (Exception e) { TraceException(e); } }
if (_debugOwner) { try { _debug.Complete(); } catch (Exception e) { TraceException(e); } }
if (_informationOwner) { try { _information.Complete(); } catch (Exception e) { TraceException(e); } }
}
private static void TraceException(Exception e)
{
using (PowerShellTraceSource tracer = PowerShellTraceSourceFactory.GetTraceSource())
{
tracer.TraceException(e);
}
}
/// <summary>
src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
+12 -2
View File
@@ -1624,7 +1624,12 @@ namespace Microsoft.PowerShell.Commands
/// <param name="nonblocking">Write in a non-blocking manner</param>
private void WriteJobResults(bool nonblocking)
{
if (_job != null)
if (_job == null)
{
return;
}
try
{
PipelineStoppedException caughtPipelineStoppedException = null;
_job.PropagateThrows = _propagateErrors;
@@ -1756,7 +1761,12 @@ namespace Microsoft.PowerShell.Commands
session.Name, session.InstanceId));
}
}
}
}
finally
{
if (_job.JobStateInfo.State == JobState.Disconnected)
{
// Allow Invoke-Command to end even though not all remote pipelines
// finished.
HandleThrottleComplete(null, null);