incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject [1/6] git commit: bug CS-15179: ensure route before connecting
Date Thu, 07 Jun 2012 00:10:16 GMT
Updated Branches:
  refs/heads/master 7092532ae -> ef4f0c695


bug CS-15179: ensure route before connecting

Reviewed-by: anthony


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

Branch: refs/heads/master
Commit: ef4f0c695a778aac493e8469b4813f4b63e4d18c
Parents: d0bdab9
Author: Kelven Yang <kelven@cloud.com>
Authored: Fri Jun 1 11:36:16 2012 -0700
Committer: Kelven Yang <kelven@cloud.com>
Committed: Wed Jun 6 16:58:13 2012 -0700

----------------------------------------------------------------------
 .../cloud/consoleproxy/ConsoleProxyVncClient.java  |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ef4f0c69/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java
----------------------------------------------------------------------
diff --git a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java
index 7293025..0feb5f6 100644
--- a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java
+++ b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java
@@ -70,6 +70,8 @@ public class ConsoleProxyVncClient extends ConsoleProxyClientBase {
 						if(tunnelUrl != null && !tunnelUrl.isEmpty() && tunnelSession != null
&& !tunnelSession.isEmpty()) {
 							URI uri = new URI(tunnelUrl);
 							s_logger.info("Connect to VNC server via tunnel. url: " + tunnelUrl + ", session:
" + tunnelSession);
+							
+							ConsoleProxy.ensureRoute(uri.getHost());
 							client.connectTo(
 								uri.getHost(), uri.getPort(), 
 								uri.getPath() + "?" + uri.getQuery(), 
@@ -77,6 +79,7 @@ public class ConsoleProxyVncClient extends ConsoleProxyClientBase {
 								getClientHostPassword());
 						} else {
 							s_logger.info("Connect to VNC server directly. host: " + getClientHostAddress() +
", port: " + getClientHostPort());
+							ConsoleProxy.ensureRoute(getClientHostAddress());
 							client.connectTo(getClientHostAddress(), getClientHostPort(), getClientHostPassword());
 						}
 					} catch (UnknownHostException e) {


Mime
View raw message