gsadmin/ssh.net
1
0
Fork 0
mirror of https://github.com/sshnet/SSH.NET.git synced 2026-09-11 01:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid extra IsOpen invocation when attempting to open channel session.

Browse Source
This commit is contained in:
drieseng
2016-09-10 19:40:09 +02:00
parent bb968f5550
commit 3808aae801
1 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Renci.SshNet/Channels/ChannelSession.cs
+26 -25
View File
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Globalization;
using System.Threading;
using Renci.SshNet.Abstractions;
using Renci.SshNet.Common;
using Renci.SshNet.Messages.Connection;
@@ -65,27 +64,27 @@ namespace Renci.SshNet.Channels
/// </summary>
public virtual void Open()
{
if (!IsOpen)
{
// Try to open channel several times
while (!IsOpen && _failedOpenAttempts < ConnectionInfo.RetryAttempts)
{
SendChannelOpenMessage();
try
{
WaitOnHandle(_channelOpenResponseWaitHandle);
}
catch (Exception)
{
// avoid leaking session semaphore
ReleaseSemaphore();
throw;
}
}
if (IsOpen)
return;
if (!IsOpen)
throw new SshException(string.Format(CultureInfo.CurrentCulture, "Failed to open a channel after {0} attempts.", _failedOpenAttempts));
}
// Try to open channel several times
do
{
SendChannelOpenMessage();
try
{
WaitOnHandle(_channelOpenResponseWaitHandle);
}
catch (Exception)
{
// avoid leaking session semaphore
ReleaseSemaphore();
throw;
}
} while (!IsOpen && _failedOpenAttempts < ConnectionInfo.RetryAttempts);
if (!IsOpen)
throw new SshException(string.Format(CultureInfo.CurrentCulture, "Failed to open a channel after {0} attempts.", _failedOpenAttempts));
}
/// <summary>
@@ -386,16 +385,18 @@ namespace Renci.SshNet.Channels
if (disposing)
{
if (_channelOpenResponseWaitHandle != null)
var channelOpenResponseWaitHandle = _channelOpenResponseWaitHandle;
if (channelOpenResponseWaitHandle != null)
{
_channelOpenResponseWaitHandle.Dispose();
_channelOpenResponseWaitHandle = null;
channelOpenResponseWaitHandle.Dispose();
}
if (_channelRequestResponse != null)
var channelRequestResponse = _channelRequestResponse;
if (channelRequestResponse != null)
{
_channelRequestResponse.Dispose();
_channelRequestResponse = null;
channelRequestResponse.Dispose();
}
}
}