Skip to content

Commit 5a1e469

Browse files
committed
No longer throw ObjectDisposedException in Stop() when port is disposed.
1 parent f50b9f1 commit 5a1e469

File tree

4 files changed

+3
-53
lines changed

4 files changed

+3
-53
lines changed

src/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Stop_PortDisposed.cs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public class ForwardedPortDynamicTest_Stop_PortDisposed
1313
private ForwardedPortDynamic _forwardedPort;
1414
private IList<EventArgs> _closingRegister;
1515
private IList<ExceptionEventArgs> _exceptionRegister;
16-
private ObjectDisposedException _actualException;
1716
private IPEndPoint _endpoint;
1817

1918
[TestInitialize]
@@ -47,22 +46,7 @@ protected void Arrange()
4746

4847
protected void Act()
4948
{
50-
try
51-
{
52-
_forwardedPort.Stop();
53-
Assert.Fail();
54-
}
55-
catch (ObjectDisposedException ex)
56-
{
57-
_actualException = ex;
58-
}
59-
}
60-
61-
[TestMethod]
62-
public void StopShouldThrowObjectDisposedException()
63-
{
64-
Assert.IsNotNull(_actualException);
65-
Assert.AreEqual(_forwardedPort.GetType().FullName, _actualException.ObjectName);
49+
_forwardedPort.Stop();
6650
}
6751

6852
[TestMethod]

src/Renci.SshNet.Tests/Classes/ForwardedPortLocalTest_Stop_PortDisposed.cs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class ForwardedPortLocalTest_Stop_PortDisposed
1111
private ForwardedPortLocal _forwardedPort;
1212
private IList<EventArgs> _closingRegister;
1313
private IList<ExceptionEventArgs> _exceptionRegister;
14-
private ObjectDisposedException _actualException;
1514

1615
[TestInitialize]
1716
public void Setup()
@@ -43,22 +42,7 @@ protected void Arrange()
4342

4443
protected void Act()
4544
{
46-
try
47-
{
48-
_forwardedPort.Stop();
49-
Assert.Fail();
50-
}
51-
catch (ObjectDisposedException ex)
52-
{
53-
_actualException = ex;
54-
}
55-
}
56-
57-
[TestMethod]
58-
public void StopShouldThrowObjectDisposedException()
59-
{
60-
Assert.IsNotNull(_actualException);
61-
Assert.AreEqual(_forwardedPort.GetType().FullName, _actualException.ObjectName);
45+
_forwardedPort.Stop();
6246
}
6347

6448
[TestMethod]

src/Renci.SshNet.Tests/Classes/ForwardedPortRemoteTest_Stop_PortDisposed.cs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public class ForwardedPortRemoteTest_Stop_PortDisposed
1414
private IPEndPoint _remoteEndpoint;
1515
private IList<EventArgs> _closingRegister;
1616
private IList<ExceptionEventArgs> _exceptionRegister;
17-
private ObjectDisposedException _actualException;
1817

1918
[TestInitialize]
2019
public void Setup()
@@ -49,22 +48,7 @@ protected void Arrange()
4948

5049
protected void Act()
5150
{
52-
try
53-
{
54-
_forwardedPort.Stop();
55-
Assert.Fail();
56-
}
57-
catch (ObjectDisposedException ex)
58-
{
59-
_actualException = ex;
60-
}
61-
}
62-
63-
[TestMethod]
64-
public void StopShouldThrowObjectDisposedException()
65-
{
66-
Assert.IsNotNull(_actualException);
67-
Assert.AreEqual(_forwardedPort.GetType().FullName, _actualException.ObjectName);
51+
_forwardedPort.Stop();
6852
}
6953

7054
[TestMethod]

src/Renci.SshNet/ForwardedPort.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ public virtual void Start()
7171
/// </summary>
7272
public virtual void Stop()
7373
{
74-
CheckDisposed();
75-
7674
if (IsStarted)
7775
{
7876
StopPort(Session.ConnectionInfo.Timeout);

0 commit comments

Comments
 (0)