From f60f16f70f2ebdeb76210e76579c50529a07535b Mon Sep 17 00:00:00 2001 From: sta Date: Sat, 25 Oct 2014 11:56:28 +0900 Subject: [PATCH] Fix for issue #84 --- websocket-sharp/Ext.cs | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs index 3dbb3847..4a71ac00 100644 --- a/websocket-sharp/Ext.cs +++ b/websocket-sharp/Ext.cs @@ -671,28 +671,24 @@ namespace WebSocketSharp 0, length, ar => { - byte[] bytes = null; - try { - var len = stream.EndRead (ar); - 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); + byte[] bytes = null; + try { + var len = stream.EndRead (ar); + bytes = len < 1 + ? new byte[0] + : len < length + ? stream.readBytes (buff, len, length - len) + : buff; + } + catch (ObjectDisposedException) { + // The Stream has been closed. + return; + } + catch { + throw; + } - return; - } - - try { if (completed != null) completed (bytes); }