From 28ce81a4d913d42069f988639b78d49739b8c76d Mon Sep 17 00:00:00 2001
From: david <david@cloudshare.com>
Date: Thu, 12 Feb 2015 14:40:48 +0200
Subject: [PATCH 1/2] GUAC-1084: ChainedTunnel does not support reconnect

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

diff --git a/guacamole-common-js/src/main/webapp/modules/Tunnel.js b/guacamole-common-js/src/main/webapp/modules/Tunnel.js
index 8954c5245..277f7e533 100644
--- a/guacamole-common-js/src/main/webapp/modules/Tunnel.js
+++ b/guacamole-common-js/src/main/webapp/modules/Tunnel.js
@@ -838,6 +838,12 @@ Guacamole.ChainedTunnel = function(tunnel_chain) {
      */
     var tunnels = [];
 
+    /**
+     * Stores a single committed tunnel once committed
+     * @private
+     */
+    var committedTunnel;
+
     // Load all tunnels into array
     for (var i=0; i<arguments.length; i++)
         tunnels.push(arguments[i]);
@@ -889,6 +895,7 @@ Guacamole.ChainedTunnel = function(tunnel_chain) {
             tunnel.onstatechange = chained_tunnel.onstatechange;
             tunnel.oninstruction = chained_tunnel.oninstruction;
             tunnel.onerror = chained_tunnel.onerror;
+            committedTunnel = tunnel;
         }
 
         // Wrap own onstatechange within current tunnel
@@ -944,8 +951,8 @@ Guacamole.ChainedTunnel = function(tunnel_chain) {
         // Remember connect data
         connect_data = data;
 
-        // Get first tunnel
-        var next_tunnel = tunnels.shift();
+        // Get committed tunnel if exists or the first tunnel on the list
+        var next_tunnel = committedTunnel ? committedTunnel : tunnels.shift();
 
         // Attach first tunnel
         if (next_tunnel)

From 9d0703125adace8b276b93a34d004c099c791aa2 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Tue, 7 Jul 2015 21:21:18 -0700
Subject: [PATCH 2/2] GUAC-1084: Clarify comment describing committedTunnel.

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

diff --git a/guacamole-common-js/src/main/webapp/modules/Tunnel.js b/guacamole-common-js/src/main/webapp/modules/Tunnel.js
index e8ff134e9..91b13713a 100644
--- a/guacamole-common-js/src/main/webapp/modules/Tunnel.js
+++ b/guacamole-common-js/src/main/webapp/modules/Tunnel.js
@@ -843,10 +843,13 @@ Guacamole.ChainedTunnel = function(tunnel_chain) {
     var tunnels = [];
 
     /**
-     * Stores a single committed tunnel once committed
+     * The tunnel committed via commit_tunnel(), if any, or null if no tunnel
+     * has yet been committed.
+     *
      * @private
+     * @type Guacamole.Tunnel
      */
-    var committedTunnel;
+    var committedTunnel = null;
 
     // Load all tunnels into array
     for (var i=0; i<arguments.length; i++)