From 1b2f1d74547ba57eafa577e237774ce1aa9f630e Mon Sep 17 00:00:00 2001
From: Devdeep Singh <devdeep@gmail.com>
Date: Mon, 11 Nov 2013 16:16:34 +0530
Subject: [PATCH] Fix the console proxy rdp client build breaking with java 6
 and make it part of regular build.

---
 .../rdpconsole/src/main/java/streamer/SocketWrapper.java        | 2 +-
 .../rdpconsole/src/test/java/rdpclient/MockServerTest.java      | 2 +-
 services/pom.xml                                                | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
index 2ddf0b635b9..c23edd8f42f 100644
--- a/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
+++ b/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
@@ -133,7 +133,7 @@ public class SocketWrapper extends PipelineImpl {
       sslContext.init(null, new TrustManager[] { new TrustAllX509TrustManager() }, null);
 
       SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
-      sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, address.getHostString(), address.getPort(), true);
+      sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, address.getHostName(), address.getPort(), true);
       sslSocket.startHandshake();
 
       InputStream sis = sslSocket.getInputStream();
diff --git a/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java b/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
index cba01fd6a49..89eed8a7c44 100644
--- a/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
+++ b/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
@@ -154,7 +154,7 @@ public class MockServerTest extends TestCase {
 		//System.setProperty("javax.net.debug", "ssl");
 
 		final SSLSocketFactory sslSocketFactory = (SSLSocketFactory) SSLSocketFactory.getDefault();
-		SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, address.getHostString(), address.getPort(), true);
+		SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, address.getHostName(), address.getPort(), true);
 		sslSocket.setEnabledCipherSuites(sslSocket.getSupportedCipherSuites());
 		sslSocket.startHandshake();
 
diff --git a/services/pom.xml b/services/pom.xml
index c2f7f88ad88..5d1403b18c8 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -32,6 +32,7 @@
   </build>
   <modules>
     <module>console-proxy</module>
+    <module>console-proxy-rdp/rdpconsole</module>
     <module>secondary-storage</module>
   </modules>
 </project>