You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2013/11/11 11:46:47 UTC
git commit: updated refs/heads/4.3 to 61386f4
Updated Branches:
refs/heads/4.3 6a8ec786a -> 61386f406
Fix the console proxy rdp client build breaking with java 6 and make it part of regular build.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/61386f40
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/61386f40
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/61386f40
Branch: refs/heads/4.3
Commit: 61386f4068bde47fdb38887a7d7e62cba5f3ccf2
Parents: 6a8ec78
Author: Devdeep Singh <de...@gmail.com>
Authored: Mon Nov 11 16:16:34 2013 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Mon Nov 11 16:16:34 2013 +0530
----------------------------------------------------------------------
.../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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61386f40/services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
----------------------------------------------------------------------
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 2ddf0b6..c23edd8 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();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61386f40/services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
----------------------------------------------------------------------
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 cba01fd..89eed8a 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();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61386f40/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index c2f7f88..5d1403b 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>