Avoid event-based memory leak in case of exception in Authenticate.

drieseng · drieseng · commit 9334312d046d · 2016-05-01T19:57:59.000+02:00
Simplify Dispose(bool).
diff --git a/src/Renci.SshNet/NoneAuthenticationMethod.cs b/src/Renci.SshNet/NoneAuthenticationMethod.cs
@@ -12,7 +12,6 @@ namespace Renci.SshNet
     public class NoneAuthenticationMethod : AuthenticationMethod, IDisposable
     {
         private AuthenticationResult _authenticationResult = AuthenticationResult.Failure;
-
         private EventWaitHandle _authenticationCompleted = new AutoResetEvent(false);
 
         /// <summary>
@@ -31,7 +30,6 @@ public override string Name
         public NoneAuthenticationMethod(string username)
             : base(username)
         {
-
         }
 
         /// <summary>
@@ -50,12 +48,16 @@ public override AuthenticationResult Authenticate(Session session)
             session.UserAuthenticationSuccessReceived += Session_UserAuthenticationSuccessReceived;
             session.UserAuthenticationFailureReceived += Session_UserAuthenticationFailureReceived;
 
-            session.SendMessage(new RequestMessageNone(ServiceName.Connection, Username));
-
-            session.WaitOnHandle(_authenticationCompleted);
-
-            session.UserAuthenticationSuccessReceived -= Session_UserAuthenticationSuccessReceived;
-            session.UserAuthenticationFailureReceived -= Session_UserAuthenticationFailureReceived;
+            try
+            {
+                session.SendMessage(new RequestMessageNone(ServiceName.Connection, Username));
+                session.WaitOnHandle(_authenticationCompleted);
+            }
+            finally
+            {
+                session.UserAuthenticationSuccessReceived -= Session_UserAuthenticationSuccessReceived;
+                session.UserAuthenticationFailureReceived -= Session_UserAuthenticationFailureReceived;
+            }
 
             return _authenticationResult;
         }
@@ -90,7 +92,6 @@ private void Session_UserAuthenticationFailureReceived(object sender, MessageEve
         public void Dispose()
         {
             Dispose(true);
-
             GC.SuppressFinalize(this);
         }
 
@@ -100,22 +101,17 @@ public void Dispose()
         /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            // Check to see if Dispose has already been called.
-            if (!_isDisposed)
+            if (_isDisposed)
+                return;
+
+            if (disposing)
             {
-                // If disposing equals true, dispose all managed
-                // and unmanaged resources.
-                if (disposing)
+                if (_authenticationCompleted != null)
                 {
-                    // Dispose managed resources.
-                    if (_authenticationCompleted != null)
-                    {
-                        _authenticationCompleted.Dispose();
-                        _authenticationCompleted = null;
-                    }
+                    _authenticationCompleted.Dispose();
+                    _authenticationCompleted = null;
                 }
 
-                // Note disposing has been done.
                 _isDisposed = true;
             }
         }
diff --git a/src/Renci.SshNet/PasswordAuthenticationMethod.cs b/src/Renci.SshNet/PasswordAuthenticationMethod.cs
@@ -12,18 +12,13 @@ namespace Renci.SshNet
     /// <summary>
     /// Provides functionality to perform password authentication.
     /// </summary>
-    public partial class PasswordAuthenticationMethod : AuthenticationMethod, IDisposable
+    public class PasswordAuthenticationMethod : AuthenticationMethod, IDisposable
     {
         private AuthenticationResult _authenticationResult = AuthenticationResult.Failure;
-
         private Session _session;
-
         private EventWaitHandle _authenticationCompleted = new AutoResetEvent(false);
-
         private Exception _exception;
-
         private readonly RequestMessage _requestMessage;
-
         private readonly byte[] _password;
 
         /// <summary>
@@ -65,7 +60,6 @@ public PasswordAuthenticationMethod(string username, byte[] password)
                 throw new ArgumentNullException("password");
 
             _password = password;
-
             _requestMessage = new RequestMessagePassword(ServiceName.Connection, Username, _password);
         }
 
@@ -88,21 +82,21 @@ public override AuthenticationResult Authenticate(Session session)
             session.UserAuthenticationFailureReceived += Session_UserAuthenticationFailureReceived;
             session.MessageReceived += Session_MessageReceived;
 
-            session.RegisterMessage("SSH_MSG_USERAUTH_PASSWD_CHANGEREQ");
-
-            session.SendMessage(_requestMessage);
-
-            session.WaitOnHandle(_authenticationCompleted);
-            
-            session.UserAuthenticationSuccessReceived -= Session_UserAuthenticationSuccessReceived;
-            session.UserAuthenticationFailureReceived -= Session_UserAuthenticationFailureReceived;
-            session.MessageReceived -= Session_MessageReceived;
-
+            try
+            {
+                session.RegisterMessage("SSH_MSG_USERAUTH_PASSWD_CHANGEREQ");
+                session.SendMessage(_requestMessage);
+                session.WaitOnHandle(_authenticationCompleted);
+            }
+            finally 
+            {
+                session.UserAuthenticationSuccessReceived -= Session_UserAuthenticationSuccessReceived;
+                session.UserAuthenticationFailureReceived -= Session_UserAuthenticationFailureReceived;
+                session.MessageReceived -= Session_MessageReceived;
+            }
 
             if (_exception != null)
-            {
                 throw _exception;
-            }
 
             return _authenticationResult;
         }
@@ -167,7 +161,6 @@ private void Session_MessageReceived(object sender, MessageEventArgs<Message> e)
         public void Dispose()
         {
             Dispose(true);
-
             GC.SuppressFinalize(this);
         }
 
@@ -177,22 +170,17 @@ public void Dispose()
         /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            // Check to see if Dispose has already been called.
-            if (!_isDisposed)
+            if (_isDisposed)
+                return;
+           
+            if (disposing)
             {
-                // If disposing equals true, dispose all managed
-                // and unmanaged resources.
-                if (disposing)
+                if (_authenticationCompleted != null)
                 {
-                    // Dispose managed resources.
-                    if (_authenticationCompleted != null)
-                    {
-                        _authenticationCompleted.Dispose();
-                        _authenticationCompleted = null;
-                    }
+                    _authenticationCompleted.Dispose();
+                    _authenticationCompleted = null;
                 }
 
-                // Note disposing has been done.
                 _isDisposed = true;
             }
         }
diff --git a/src/Renci.SshNet/PasswordConnectionInfo.cs b/src/Renci.SshNet/PasswordConnectionInfo.cs
@@ -37,7 +37,6 @@ public class PasswordConnectionInfo : ConnectionInfo, IDisposable
         public PasswordConnectionInfo(string host, string username, string password)
             : this(host, DefaultPort, username, Encoding.UTF8.GetBytes(password))
         {
-
         }
 
         /// <summary>
@@ -140,7 +139,6 @@ public PasswordConnectionInfo(string host, string username, string password, Pro
         public PasswordConnectionInfo(string host, string username, byte[] password)
             : this(host, DefaultPort, username, password)
         {
-
         }
 
         /// <summary>
@@ -273,7 +271,6 @@ private void AuthenticationMethod_PasswordExpired(object sender, AuthenticationP
         public void Dispose()
         {
             Dispose(true);
-
             GC.SuppressFinalize(this);
         }
 
@@ -283,24 +280,19 @@ public void Dispose()
         /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            // Check to see if Dispose has already been called.
-            if (!_isDisposed)
+            if (_isDisposed)
+                return;
+
+            if (disposing)
             {
-                // If disposing equals true, dispose all managed
-                // and unmanaged resources.
-                if (disposing)
+                if (AuthenticationMethods != null)
                 {
-                    // Dispose managed resources.
-                    if (AuthenticationMethods != null)
+                    foreach (var authenticationMethods in AuthenticationMethods.OfType<IDisposable>())
                     {
-                        foreach (var authenticationMethods in AuthenticationMethods.OfType<IDisposable>())
-                        {
-                            authenticationMethods.Dispose();
-                        }
+                        authenticationMethods.Dispose();
                     }
                 }
 
-                // Note disposing has been done.
                 _isDisposed = true;
             }
         }
diff --git a/src/Renci.SshNet/PrivateKeyAuthenticationMethod.cs b/src/Renci.SshNet/PrivateKeyAuthenticationMethod.cs
@@ -15,9 +15,7 @@ namespace Renci.SshNet
     public class PrivateKeyAuthenticationMethod : AuthenticationMethod, IDisposable
     {
         private AuthenticationResult _authenticationResult = AuthenticationResult.Failure;
-
         private EventWaitHandle _authenticationCompleted = new ManualResetEvent(false);
-
         private bool _isSignatureRequired;
 
         /// <summary>
@@ -154,7 +152,6 @@ private void Session_MessageReceived(object sender, MessageEventArgs<Message> e)
         public void Dispose()
         {
             Dispose(true);
-
             GC.SuppressFinalize(this);
         }
 
@@ -164,22 +161,17 @@ public void Dispose()
         /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            // Check to see if Dispose has already been called.
-            if (!_isDisposed)
+            if (_isDisposed)
+                return;
+
+            if (disposing)
             {
-                // If disposing equals true, dispose all managed
-                // and unmanaged resources.
-                if (disposing)
+                if (_authenticationCompleted != null)
                 {
-                    // Dispose managed resources.
-                    if (_authenticationCompleted != null)
-                    {
-                        _authenticationCompleted.Dispose();
-                        _authenticationCompleted = null;
-                    }
+                    _authenticationCompleted.Dispose();
+                    _authenticationCompleted = null;
                 }
 
-                // Note disposing has been done.
                 _isDisposed = true;
             }
         }
diff --git a/src/Renci.SshNet/PrivateKeyConnectionInfo.cs b/src/Renci.SshNet/PrivateKeyConnectionInfo.cs
@@ -29,7 +29,7 @@ public class PrivateKeyConnectionInfo : ConnectionInfo, IDisposable
         ///     <code source="..\..\Renci.SshNet.Tests\Classes\PrivateKeyConnectionInfoTest.cs" region="Example PrivateKeyConnectionInfo PrivateKeyFile Multiple" language="C#" title="Connect using multiple private key" />
         /// </example>
         public PrivateKeyConnectionInfo(string host, string username, params PrivateKeyFile[] keyFiles)
-            : this(host, ConnectionInfo.DefaultPort, username, ProxyTypes.None, string.Empty, 0, string.Empty, string.Empty, keyFiles)
+            : this(host, DefaultPort, username, ProxyTypes.None, string.Empty, 0, string.Empty, string.Empty, keyFiles)
         {
 
         }
@@ -87,7 +87,7 @@ public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTyp
         /// <param name="proxyPort">The proxy port.</param>
         /// <param name="keyFiles">The key files.</param>
         public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, params PrivateKeyFile[] keyFiles)
-            : this(host, ConnectionInfo.DefaultPort, username, proxyType, proxyHost, proxyPort, string.Empty, string.Empty, keyFiles)
+            : this(host, DefaultPort, username, proxyType, proxyHost, proxyPort, string.Empty, string.Empty, keyFiles)
         {
         }
 
@@ -102,7 +102,7 @@ public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyTy
         /// <param name="proxyUsername">The proxy username.</param>
         /// <param name="keyFiles">The key files.</param>
         public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, params PrivateKeyFile[] keyFiles)
-            : this(host, ConnectionInfo.DefaultPort, username, proxyType, proxyHost, proxyPort, proxyUsername, string.Empty, keyFiles)
+            : this(host, DefaultPort, username, proxyType, proxyHost, proxyPort, proxyUsername, string.Empty, keyFiles)
         {
         }
 
@@ -118,7 +118,7 @@ public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyTy
         /// <param name="proxyPassword">The proxy password.</param>
         /// <param name="keyFiles">The key files.</param>
         public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, params PrivateKeyFile[] keyFiles)
-            : this(host, ConnectionInfo.DefaultPort, username, proxyType, proxyHost, proxyPort, proxyUsername, proxyPassword, keyFiles)
+            : this(host, DefaultPort, username, proxyType, proxyHost, proxyPort, proxyUsername, proxyPassword, keyFiles)
         {
         }
 
@@ -137,7 +137,7 @@ public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyTy
         public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, params PrivateKeyFile[] keyFiles)
             : base(host, port, username, proxyType, proxyHost, proxyPort, proxyUsername, proxyPassword, new PrivateKeyAuthenticationMethod(username, keyFiles))
         {
-            this.KeyFiles = new Collection<PrivateKeyFile>(keyFiles);
+            KeyFiles = new Collection<PrivateKeyFile>(keyFiles);
         }
 
         #region IDisposable Members
@@ -150,7 +150,6 @@ public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTyp
         public void Dispose()
         {
             Dispose(true);
-
             GC.SuppressFinalize(this);
         }
 
@@ -160,24 +159,20 @@ public void Dispose()
         /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
-            // Check to see if Dispose has already been called.
-            if (!this._isDisposed)
+            if (_isDisposed)
+                return;
+
+            if (disposing)
             {
-                // If disposing equals true, dispose all managed
-                // and unmanaged resources.
-                if (disposing)
+                // Dispose managed resources.
+                if (AuthenticationMethods != null)
                 {
-                    // Dispose managed resources.
-                    if (this.AuthenticationMethods != null)
+                    foreach (var authenticationMethods in AuthenticationMethods.OfType<IDisposable>())
                     {
-                        foreach (var authenticationMethods in this.AuthenticationMethods.OfType<IDisposable>())
-                        {
-                            authenticationMethods.Dispose();
-                        }
+                        authenticationMethods.Dispose();
                     }
                 }
 
-                // Note disposing has been done.
                 _isDisposed = true;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ public class PasswordConnectionInfo : ConnectionInfo, IDisposable`
`37`	`37`	`public PasswordConnectionInfo(string host, string username, string password)`
`38`	`38`	`: this(host, DefaultPort, username, Encoding.UTF8.GetBytes(password))`
`39`	`39`	`{`
`40`		`-`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`/// <summary>`
`@@ -140,7 +139,6 @@ public PasswordConnectionInfo(string host, string username, string password, Pro`
`140`	`139`	`public PasswordConnectionInfo(string host, string username, byte[] password)`
`141`	`140`	`: this(host, DefaultPort, username, password)`
`142`	`141`	`{`
`143`		`-`
`144`	`142`	`}`
`145`	`143`
`146`	`144`	`/// <summary>`
`@@ -273,7 +271,6 @@ private void AuthenticationMethod_PasswordExpired(object sender, AuthenticationP`
`273`	`271`	`public void Dispose()`
`274`	`272`	`{`
`275`	`273`	`Dispose(true);`
`276`		`-`
`277`	`274`	`GC.SuppressFinalize(this);`
`278`	`275`	`}`
`279`	`276`
`@@ -283,24 +280,19 @@ public void Dispose()`
`283`	`280`	`/// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>`
`284`	`281`	`protected virtual void Dispose(bool disposing)`
`285`	`282`	`{`
`286`		`- // Check to see if Dispose has already been called.`
`287`		`- if (!_isDisposed)`
	`283`	`+ if (_isDisposed)`
	`284`	`+ return;`
	`285`	`+`
	`286`	`+ if (disposing)`
`288`	`287`	`{`
`289`		`- // If disposing equals true, dispose all managed`
`290`		`- // and unmanaged resources.`
`291`		`- if (disposing)`
	`288`	`+ if (AuthenticationMethods != null)`
`292`	`289`	`{`
`293`		`- // Dispose managed resources.`
`294`		`- if (AuthenticationMethods != null)`
	`290`	`+ foreach (var authenticationMethods in AuthenticationMethods.OfType<IDisposable>())`
`295`	`291`	`{`
`296`		`- foreach (var authenticationMethods in AuthenticationMethods.OfType<IDisposable>())`
`297`		`- {`
`298`		`- authenticationMethods.Dispose();`
`299`		`- }`
	`292`	`+ authenticationMethods.Dispose();`
`300`	`293`	`}`
`301`	`294`	`}`
`302`	`295`
`303`		`- // Note disposing has been done.`
`304`	`296`	`_isDisposed = true;`
`305`	`297`	`}`
`306`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,7 @@ namespace Renci.SshNet`
`15`	`15`	`public class PrivateKeyAuthenticationMethod : AuthenticationMethod, IDisposable`
`16`	`16`	`{`
`17`	`17`	`private AuthenticationResult _authenticationResult = AuthenticationResult.Failure;`
`18`		`-`
`19`	`18`	`private EventWaitHandle _authenticationCompleted = new ManualResetEvent(false);`
`20`		`-`
`21`	`19`	`private bool _isSignatureRequired;`
`22`	`20`
`23`	`21`	`/// <summary>`
`@@ -154,7 +152,6 @@ private void Session_MessageReceived(object sender, MessageEventArgs<Message> e)`
`154`	`152`	`public void Dispose()`
`155`	`153`	`{`
`156`	`154`	`Dispose(true);`
`157`		`-`
`158`	`155`	`GC.SuppressFinalize(this);`
`159`	`156`	`}`
`160`	`157`
`@@ -164,22 +161,17 @@ public void Dispose()`
`164`	`161`	`/// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>`
`165`	`162`	`protected virtual void Dispose(bool disposing)`
`166`	`163`	`{`
`167`		`- // Check to see if Dispose has already been called.`
`168`		`- if (!_isDisposed)`
	`164`	`+ if (_isDisposed)`
	`165`	`+ return;`
	`166`	`+`
	`167`	`+ if (disposing)`
`169`	`168`	`{`
`170`		`- // If disposing equals true, dispose all managed`
`171`		`- // and unmanaged resources.`
`172`		`- if (disposing)`
	`169`	`+ if (_authenticationCompleted != null)`
`173`	`170`	`{`
`174`		`- // Dispose managed resources.`
`175`		`- if (_authenticationCompleted != null)`
`176`		`- {`
`177`		`- _authenticationCompleted.Dispose();`
`178`		`- _authenticationCompleted = null;`
`179`		`- }`
	`171`	`+ _authenticationCompleted.Dispose();`
	`172`	`+ _authenticationCompleted = null;`
`180`	`173`	`}`
`181`	`174`
`182`		`- // Note disposing has been done.`
`183`	`175`	`_isDisposed = true;`
`184`	`176`	`}`
`185`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class PrivateKeyConnectionInfo : ConnectionInfo, IDisposable`
`29`	`29`	`/// <code source="..\..\Renci.SshNet.Tests\Classes\PrivateKeyConnectionInfoTest.cs" region="Example PrivateKeyConnectionInfo PrivateKeyFile Multiple" language="C#" title="Connect using multiple private key" />`
`30`	`30`	`/// </example>`
`31`	`31`	`public PrivateKeyConnectionInfo(string host, string username, params PrivateKeyFile[] keyFiles)`
`32`		`- : this(host, ConnectionInfo.DefaultPort, username, ProxyTypes.None, string.Empty, 0, string.Empty, string.Empty, keyFiles)`
	`32`	`+ : this(host, DefaultPort, username, ProxyTypes.None, string.Empty, 0, string.Empty, string.Empty, keyFiles)`
`33`	`33`	`{`
`34`	`34`
`35`	`35`	`}`
`@@ -87,7 +87,7 @@ public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTyp`
`87`	`87`	`/// <param name="proxyPort">The proxy port.</param>`
`88`	`88`	`/// <param name="keyFiles">The key files.</param>`
`89`	`89`	`public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, params PrivateKeyFile[] keyFiles)`
`90`		`- : this(host, ConnectionInfo.DefaultPort, username, proxyType, proxyHost, proxyPort, string.Empty, string.Empty, keyFiles)`
	`90`	`+ : this(host, DefaultPort, username, proxyType, proxyHost, proxyPort, string.Empty, string.Empty, keyFiles)`
`91`	`91`	`{`
`92`	`92`	`}`
`93`	`93`
`@@ -102,7 +102,7 @@ public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyTy`
`102`	`102`	`/// <param name="proxyUsername">The proxy username.</param>`
`103`	`103`	`/// <param name="keyFiles">The key files.</param>`
`104`	`104`	`public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, params PrivateKeyFile[] keyFiles)`
`105`		`- : this(host, ConnectionInfo.DefaultPort, username, proxyType, proxyHost, proxyPort, proxyUsername, string.Empty, keyFiles)`
	`105`	`+ : this(host, DefaultPort, username, proxyType, proxyHost, proxyPort, proxyUsername, string.Empty, keyFiles)`
`106`	`106`	`{`
`107`	`107`	`}`
`108`	`108`
`@@ -118,7 +118,7 @@ public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyTy`
`118`	`118`	`/// <param name="proxyPassword">The proxy password.</param>`
`119`	`119`	`/// <param name="keyFiles">The key files.</param>`
`120`	`120`	`public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, params PrivateKeyFile[] keyFiles)`
`121`		`- : this(host, ConnectionInfo.DefaultPort, username, proxyType, proxyHost, proxyPort, proxyUsername, proxyPassword, keyFiles)`
	`121`	`+ : this(host, DefaultPort, username, proxyType, proxyHost, proxyPort, proxyUsername, proxyPassword, keyFiles)`
`122`	`122`	`{`
`123`	`123`	`}`
`124`	`124`
`@@ -137,7 +137,7 @@ public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyTy`
`137`	`137`	`public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, params PrivateKeyFile[] keyFiles)`
`138`	`138`	`: base(host, port, username, proxyType, proxyHost, proxyPort, proxyUsername, proxyPassword, new PrivateKeyAuthenticationMethod(username, keyFiles))`
`139`	`139`	`{`
`140`		`- this.KeyFiles = new Collection<PrivateKeyFile>(keyFiles);`
	`140`	`+ KeyFiles = new Collection<PrivateKeyFile>(keyFiles);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`#region IDisposable Members`
`@@ -150,7 +150,6 @@ public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTyp`
`150`	`150`	`public void Dispose()`
`151`	`151`	`{`
`152`	`152`	`Dispose(true);`
`153`		`-`
`154`	`153`	`GC.SuppressFinalize(this);`
`155`	`154`	`}`
`156`	`155`
`@@ -160,24 +159,20 @@ public void Dispose()`
`160`	`159`	`/// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>`
`161`	`160`	`protected virtual void Dispose(bool disposing)`
`162`	`161`	`{`
`163`		`- // Check to see if Dispose has already been called.`
`164`		`- if (!this._isDisposed)`
	`162`	`+ if (_isDisposed)`
	`163`	`+ return;`
	`164`	`+`
	`165`	`+ if (disposing)`
`165`	`166`	`{`
`166`		`- // If disposing equals true, dispose all managed`
`167`		`- // and unmanaged resources.`
`168`		`- if (disposing)`
	`167`	`+ // Dispose managed resources.`
	`168`	`+ if (AuthenticationMethods != null)`
`169`	`169`	`{`
`170`		`- // Dispose managed resources.`
`171`		`- if (this.AuthenticationMethods != null)`
	`170`	`+ foreach (var authenticationMethods in AuthenticationMethods.OfType<IDisposable>())`
`172`	`171`	`{`
`173`		`- foreach (var authenticationMethods in this.AuthenticationMethods.OfType<IDisposable>())`
`174`		`- {`
`175`		`- authenticationMethods.Dispose();`
`176`		`- }`
	`172`	`+ authenticationMethods.Dispose();`
`177`	`173`	`}`
`178`	`174`	`}`
`179`	`175`
`180`		`- // Note disposing has been done.`
`181`	`176`	`_isDisposed = true;`
`182`	`177`	`}`
`183`	`178`	`}`