Skip to content

Commit 1edc4ff

Browse files
mus65mus65
committed
fix IDE0031
https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/ide0031
1 parent fb96e1d commit 1edc4ff

File tree

58 files changed

+186
-459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+186
-459
lines changed

‎src/Renci.SshNet/NetConfClient.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,11 +299,8 @@ protected override void Dispose(bool disposing)
299299

300300
if (disposing)
301301
{
302-
if (_netConfSession != null)
303-
{
304-
_netConfSession.Dispose();
305-
_netConfSession = null;
306-
}
302+
_netConfSession?.Dispose();
303+
_netConfSession = null;
307304
}
308305
}
309306

‎src/Renci.SshNet/Netconf/NetConfSession.cs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -213,17 +213,11 @@ protected override void Dispose(bool disposing)
213213

214214
if (disposing)
215215
{
216-
if (_serverCapabilitiesConfirmed != null)
217-
{
218-
_serverCapabilitiesConfirmed.Dispose();
219-
_serverCapabilitiesConfirmed = null;
220-
}
216+
_serverCapabilitiesConfirmed?.Dispose();
217+
_serverCapabilitiesConfirmed = null;
221218

222-
if (_rpcReplyReceived != null)
223-
{
224-
_rpcReplyReceived.Dispose();
225-
_rpcReplyReceived = null;
226-
}
219+
_rpcReplyReceived?.Dispose();
220+
_rpcReplyReceived = null;
227221
}
228222
}
229223
}

‎src/Renci.SshNet/Session.cs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1570,17 +1570,11 @@ internal void OnNewKeysReceived(NewKeysMessage message)
15701570
disposableClientCipher.Dispose();
15711571
}
15721572

1573-
if (_serverMac != null)
1574-
{
1575-
_serverMac.Dispose();
1576-
_serverMac = null;
1577-
}
1573+
_serverMac?.Dispose();
1574+
_serverMac = null;
15781575

1579-
if (_clientMac != null)
1580-
{
1581-
_clientMac.Dispose();
1582-
_clientMac = null;
1583-
}
1576+
_clientMac?.Dispose();
1577+
_clientMac = null;
15841578

15851579
// Update negotiated algorithms
15861580
_serverCipher = _keyExchange.CreateServerCipher(out _serverAead);

‎src/Renci.SshNet/SshClient.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,11 +325,8 @@ protected override void Dispose(bool disposing)
325325

326326
if (disposing)
327327
{
328-
if (_inputStream != null)
329-
{
330-
_inputStream.Dispose();
331-
_inputStream = null;
332-
}
328+
_inputStream?.Dispose();
329+
_inputStream = null;
333330

334331
_isDisposed = true;
335332
}

‎test/Renci.SshNet.Tests/Classes/Channels/ChannelDirectTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,11 @@ public void Initialize()
4747
[TestCleanup]
4848
public void CleanUp()
4949
{
50-
if (_client != null)
51-
{
52-
_client.Dispose();
53-
_client = null;
54-
}
50+
_client?.Dispose();
51+
_client = null;
5552

56-
if (_listener != null)
57-
{
58-
_listener.Stop();
59-
_listener = null;
60-
}
53+
_listener?.Stop();
54+
_listener = null;
6155
}
6256

6357
private void Arrange()

‎test/Renci.SshNet.Tests/Classes/Channels/ChannelForwardedTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,14 @@ public void Initialize()
4747
[TestCleanup]
4848
public void CleanUp()
4949
{
50-
if (_remoteListener != null)
51-
{
52-
_remoteListener.Stop();
53-
_remoteListener = null;
54-
}
50+
_remoteListener?.Stop();
51+
_remoteListener = null;
5552

56-
if (_channelThread != null)
57-
{
58-
_channelThread.Join();
59-
_channelThread = null;
60-
}
53+
_channelThread?.Join();
54+
_channelThread = null;
6155

62-
if (_channel != null)
63-
{
64-
_channel.Dispose();
65-
_channel = null;
66-
}
56+
_channel?.Dispose();
57+
_channel = null;
6758
}
6859

6960
private void Arrange()

‎test/Renci.SshNet.Tests/Classes/Channels/ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceived_SendEofInvoked.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,8 @@ public class ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofNotReceiv
3131
[TestCleanup]
3232
public void TearDown()
3333
{
34-
if (_channelClosedEventHandlerCompleted != null)
35-
{
36-
_channelClosedEventHandlerCompleted.Dispose();
37-
_channelClosedEventHandlerCompleted = null;
38-
}
34+
_channelClosedEventHandlerCompleted?.Dispose();
35+
_channelClosedEventHandlerCompleted = null;
3936
}
4037

4138
protected override void SetupData()

‎test/Renci.SshNet.Tests/Classes/Channels/ChannelTest_Dispose_SessionIsConnectedAndChannelIsOpen_EofReceived.cs‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,14 @@ protected override void SetupMocks()
9191
[TestCleanup]
9292
public void TearDown()
9393
{
94-
if (_channelClosedReceived != null)
95-
{
96-
_channelClosedReceived.Dispose();
97-
_channelClosedReceived = null;
98-
}
99-
100-
if (_raiseChannelCloseReceivedThread != null)
101-
{
102-
_raiseChannelCloseReceivedThread.Join();
103-
_raiseChannelCloseReceivedThread = null;
104-
}
105-
106-
if (_channelClosedEventHandlerCompleted != null)
107-
{
108-
_channelClosedEventHandlerCompleted.Dispose();
109-
_channelClosedEventHandlerCompleted = null;
110-
}
94+
_channelClosedReceived?.Dispose();
95+
_channelClosedReceived = null;
96+
97+
_raiseChannelCloseReceivedThread?.Join();
98+
_raiseChannelCloseReceivedThread = null;
99+
100+
_channelClosedEventHandlerCompleted?.Dispose();
101+
_channelClosedEventHandlerCompleted = null;
111102
}
112103

113104
protected override void Arrange()

‎test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,8 @@ public void Setup()
3535
[TestCleanup]
3636
public void Cleanup()
3737
{
38-
if (_server != null)
39-
{
40-
_server.Dispose();
41-
_server = null;
42-
}
38+
_server?.Dispose();
39+
_server = null;
4340

4441
if (_client != null)
4542
{

‎test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,8 @@ public void Setup()
3838
[TestCleanup]
3939
public void Cleanup()
4040
{
41-
if (_server != null)
42-
{
43-
_server.Dispose();
44-
_server = null;
45-
}
41+
_server?.Dispose();
42+
_server = null;
4643

4744
if (_client != null)
4845
{

0 commit comments

Comments
 (0)