Skip to content

Fix IDisposable implementation in sealed classes #24719

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

Open
xtqqczze wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix IDisposable implementation in sealed classes #24719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 18 additions & 31 deletions src/System.Management.Automation/engine/remoting/client/PowerShellStreams.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,9 @@ public PowerShellStreams(PSDataCollection<TInput> pipelineInput)
}

/// <summary>
/// Dispose implementation.
/// Release all resources.
/// </summary>
public void Dispose()
{
this.Dispose(true);
GC.SuppressFinalize(this);
}

/// <summary>
/// Protected virtual implementation of Dispose.
/// </summary>
/// <param name="disposing"></param>
private void Dispose(bool disposing)
{
if (_disposed)
return;
Expand All @@ -118,26 +108,23 @@ private void Dispose(bool disposing)
{
if (!_disposed)
{
if (disposing)
{
_inputStream.Dispose();
_outputStream.Dispose();
_errorStream.Dispose();
_warningStream.Dispose();
_progressStream.Dispose();
_verboseStream.Dispose();
_debugStream.Dispose();
_informationStream.Dispose();

_inputStream = null;
_outputStream = null;
_errorStream = null;
_warningStream = null;
_progressStream = null;
_verboseStream = null;
_debugStream = null;
_informationStream = null;
}
_inputStream.Dispose();
_outputStream.Dispose();
_errorStream.Dispose();
_warningStream.Dispose();
_progressStream.Dispose();
_verboseStream.Dispose();
_debugStream.Dispose();
_informationStream.Dispose();

_inputStream = null;
_outputStream = null;
_errorStream = null;
_warningStream = null;
_progressStream = null;
_verboseStream = null;
_debugStream = null;
_informationStream = null;

_disposed = true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1904,7 +1904,7 @@ protected override void Dispose(bool disposing)
if (!_isDisposed)
{
_isDisposed = true;
DataStructureHandler.Dispose(disposing);
DataStructureHandler.Dispose();
_applicationPrivateDataReceived.Dispose();
}
}
Expand Down
22 changes: 4 additions & 18 deletions src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,29 +948,15 @@ internal bool EndpointSupportsDisconnect

#region IDisposable

/// <summary>
/// Public interface for dispose.
/// </summary>
public void Dispose()
{
Dispose(true);

GC.SuppressFinalize(this);
}

/// <summary>
/// Release all resources.
/// </summary>
/// <param name="disposing">If true, release all managed resources.</param>
public void Dispose(bool disposing)
public void Dispose()
{
if (disposing)
if (RemoteSession != null)
{
if (RemoteSession != null)
{
((ClientRemoteSessionImpl)RemoteSession).Dispose();
RemoteSession = null;
}
((ClientRemoteSessionImpl)RemoteSession).Dispose();
RemoteSession = null;
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/System.Management.Automation/engine/remoting/client/ThrottlingJob.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,9 +1176,11 @@ private void StopMonitoringAllJobs()
}
}

/// <summary>
/// Release all resources.
/// </summary>
public void Dispose()
{
GC.SuppressFinalize(this);
_cancellationTokenSource.Cancel();
lock (_myLock)
{
Expand Down
9 changes: 4 additions & 5 deletions src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,13 @@ internal static ExecutionContextForStepping PrepareExecutionContext(
return result;
}

// Summary:
// Performs application-defined tasks associated with freeing, releasing, or
// resetting unmanaged resources.
void IDisposable.Dispose()
/// <summary>
/// Release all resources.
/// </summary>
public void Dispose()
{
_executionContext.InternalHost.InternalUI.SetInformationalMessageBuffers(_originalInformationalBuffers);
_executionContext.InternalHost.SetHostRef(_originalHost);
GC.SuppressFinalize(this);
}
}

Expand Down