Fix for issue #84

2014-10-24 11:53:24 +09:00 · 2014-10-24 11:53:24 +09:00 · 2a3a62ec82
commit 2a3a62ec82
parent 36b860b75f
1 changed files with 19 additions and 5 deletions
--- a/websocket-sharp/Ext.cs
+++ b/websocket-sharp/Ext.cs
@ -671,14 +671,28 @@ namespace WebSocketSharp
        0,
        length,
        ar => {
+          byte[] bytes = null;
+
          try {
            var len = stream.EndRead (ar);
-            var bytes = len < 1
+            bytes = len < 1
                    ? new byte[0]
                    : len < length
                      ? stream.readBytes (buff, len, length - len)
                      : buff;
+          }
+          catch (ObjectDisposedException) {
+            // The Stream has been closed.
+            return;
+          }
+          catch (Exception ex) {
+            if (error != null)
+              error (ex);

+            return;
+          }
+
+          try {
            if (completed != null)
              completed (bytes);
          }