GithubStar/SSH.NET
1
0
Fork 0
mirror of https://github.com/sshnet/SSH.NET.git synced 2026-10-29 15:11:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Lock _incoming object where performing Enqueue

Browse Source 
Rollback previouse commit
This commit is contained in:
olegkap_cp
2013-03-02 14:37:53 +00:00
parent d0c028a938
commit 4df7a2849b
1 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Renci.SshClient/Renci.SshNet/ShellStream.cs
+10 -22
View File
@@ -281,10 +281,7 @@ namespace Renci.SshNet
{
if (this._incoming.Count > 0)
{
lock (this._encoding)
{
text = this._encoding.GetString(this._incoming.ToArray(), 0, this._incoming.Count);
}
text = this._encoding.GetString(this._incoming.ToArray(), 0, this._incoming.Count);
}
if (text.Length > 0)
@@ -398,10 +395,7 @@ namespace Renci.SshNet
if (this._incoming.Count > 0)
{
lock (this._encoding)
{
text = this._encoding.GetString(this._incoming.ToArray(), 0, this._incoming.Count);
}
text = this._encoding.GetString(this._incoming.ToArray(), 0, this._incoming.Count);
}
if (text.Length > 0)
@@ -533,10 +527,7 @@ namespace Renci.SshNet
{
if (this._incoming.Count > 0)
{
lock (this._encoding)
{
text = this._encoding.GetString(this._incoming.ToArray(), 0, this._incoming.Count);
}
text = this._encoding.GetString(this._incoming.ToArray(), 0, this._incoming.Count);
}
var match = regex.Match(text);
@@ -595,10 +586,7 @@ namespace Renci.SshNet
{
if (this._incoming.Count > 0)
{
lock (this._encoding)
{
text = this._encoding.GetString(this._incoming.ToArray(), 0, this._incoming.Count);
}
text = this._encoding.GetString(this._incoming.ToArray(), 0, this._incoming.Count);
}
var index = text.IndexOf("\r\n");
@@ -643,10 +631,7 @@ namespace Renci.SshNet
lock (this._incoming)
{
lock (this._encoding)
{
text = this._encoding.GetString(this._incoming.ToArray(), 0, this._incoming.Count);
}
text = this._encoding.GetString(this._incoming.ToArray(), 0, this._incoming.Count);
this._incoming.Clear();
}
@@ -740,9 +725,12 @@ namespace Renci.SshNet
private void Channel_DataReceived(object sender, ChannelDataEventArgs e)
{
foreach (var b in e.Data)
lock (this._incoming)
{
_incoming.Enqueue(b);
foreach (var b in e.Data)
{
this._incoming.Enqueue(b);
}
}
this._dataReceived.Set();