guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mjum...@apache.org
Subject [1/2] incubator-guacamole-client git commit: GUACAMOLE-229: Remove intervals properly when XHR is polling.
Date Thu, 02 Mar 2017 19:52:44 GMT
Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/master 3ec99cbcd -> 865ec1970


GUACAMOLE-229: Remove intervals properly when XHR is polling.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/b5bd316d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/b5bd316d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/b5bd316d

Branch: refs/heads/master
Commit: b5bd316dfdd2a87d470a97871f679e38bedc6659
Parents: 3ec99cb
Author: Tyler Schneider <teschnei@gmail.com>
Authored: Thu Mar 2 11:01:53 2017 -0700
Committer: Tyler Schneider <teschnei@gmail.com>
Committed: Thu Mar 2 11:59:58 2017 -0700

----------------------------------------------------------------------
 guacamole-common-js/src/main/webapp/modules/Tunnel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/b5bd316d/guacamole-common-js/src/main/webapp/modules/Tunnel.js
----------------------------------------------------------------------
diff --git a/guacamole-common-js/src/main/webapp/modules/Tunnel.js b/guacamole-common-js/src/main/webapp/modules/Tunnel.js
index 6ec4798..44013e8 100644
--- a/guacamole-common-js/src/main/webapp/modules/Tunnel.js
+++ b/guacamole-common-js/src/main/webapp/modules/Tunnel.js
@@ -393,7 +393,7 @@ Guacamole.HTTPTunnel = function(tunnelURL, crossDomain) {
                 if (pollingMode === POLLING_ENABLED) {
                     if (xmlhttprequest.readyState === 3 && !interval)
                         interval = setInterval(parseResponse, 30);
-                    else if (xmlhttprequest.readyState === 4 && !interval)
+                    else if (xmlhttprequest.readyState === 4 && interval)
                         clearInterval(interval);
                 }
 
@@ -461,7 +461,7 @@ Guacamole.HTTPTunnel = function(tunnelURL, crossDomain) {
                         if (length === 0) {
 
                             // Clean up interval if polling
-                            if (!interval)
+                            if (interval)
                                 clearInterval(interval);
                            
                             // Clean up object


Mime
View raw message