From 1f1695736995dce595e57eaaece3fef99ca1d381 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Fri, 1 Jun 2012 11:36:16 -0700
Subject: [PATCH] bug CS-15179: ensure route before connecting

Reviewed-by: anthony
---
 .../src/com/cloud/consoleproxy/ConsoleProxyVncClient.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java
index 729302559dd..0feb5f68dbb 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) {