DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix WebSocket.cs

Browse Source
This commit is contained in:
sta
2010-10-20 10:51:42 +09:00
parent e9d591b606
commit 6cd3f2ad91
21 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
websocket-sharp/WebSocket.cs
View File

@@ -219,17 +219,15 @@ namespace WebSocketSharp
}
catch (Exception e)
{
if (OnError != null)
{
OnError(this, e.Message);
}
#if DEBUG
Console.WriteLine("WS: Error @close: {0}", e.Message);
#endif
}
}
if (!(Thread.CurrentThread.IsBackground) &&
msgThread != null && msgThread.IsAlive)
{
msgThread.Join();
}
if (wsStream != null)
{
@@ -363,14 +361,11 @@ namespace WebSocketSharp
#endif
while (readyState == WsState.OPEN)
{
while (readyState == WsState.OPEN && netStream.DataAvailable)
{
data = receive();
data = receive();
if (OnMessage != null && data != null)
{
OnMessage(this, data);
}
if (OnMessage != null && data != null)
{
OnMessage(this, data);
}
}
#if DEBUG
@@ -433,15 +428,18 @@ namespace WebSocketSharp
}
catch (Exception e)
{
if (OnError != null)
if (readyState == WsState.OPEN)
{
OnError(this, e.Message);
}
if (OnError != null)
{
OnError(this, e.Message);
}
ReadyState = WsState.CLOSED;
ReadyState = WsState.CLOSING;
#if DEBUG
Console.WriteLine("WS: Error @receive: {0}", e.Message);
Console.WriteLine("WS: Error @receive: {0}", e.Message);
#endif
}
}
return null;