Whenever we fail at parsing a response from the server we trigger the…

… error handler and stop the connection. #2506
SignalR · Nov 5, 2013 · b5831f8 · b5831f8
1 parent 3753bab
commit b5831f8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.common.js b/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.common.js
@@ -95,6 +95,7 @@
                         }
                         catch (error) {
                             deferral.reject("Failed to parse ping server response, stopping the connection: " + result);
+                            connection.stop();
                             return;
                         }
 
@@ -224,6 +225,7 @@
                             }
                             catch (error) {
                                 onFail(error, connection);
+                                connection.stop();
                                 return;
                             }
 

diff --git a/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.longPolling.js b/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.longPolling.js
@@ -119,16 +119,18 @@
                                     // reconnected quickly
                                     reconnectErrors = 0;
 
-                                    // If there's currently a timeout to trigger reconnect, fire it now before processing messages
-                                    if (privateData.reconnectTimeoutId !== null) {
-                                        fireReconnected();
-                                    }
-
                                     try {
                                         minData = connection._parseResponse(result);
                                     }
                                     catch (error) {
                                         $(connection).triggerHandler(events.onError, ["SignalR: failed at parsing response: " + result + ".  With error: " + error.message]);
+                                        connection.stop();
+                                        return;
+                                    }
+
+                                    // If there's currently a timeout to trigger reconnect, fire it now before processing messages
+                                    if (privateData.reconnectTimeoutId !== null) {
+                                        fireReconnected();
                                     }
 
                                     fireConnect();

diff --git a/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.serverSentEvents.js b/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.serverSentEvents.js
@@ -122,6 +122,7 @@
                 }
                 catch (error) {
                     $(connection).triggerHandler(events.onError, ["SignalR: failed at parsing response: " + e.data + ".  With error: " + error.message]);
+                    connection.stop();
                     return;
                 }
 

diff --git a/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.webSockets.js b/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.webSockets.js
@@ -104,6 +104,7 @@
                     }
                     catch (error) {
                         $connection.triggerHandler(events.onError, ["SignalR: failed at parsing response: " + event.data + ".  With error: " + error.message]);
+                        connection.stop();
                         return;
                     }