apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the console proxy rdp client build breaking with java 6 and make it part of regular build.

Browse Source
This commit is contained in:
Devdeep Singh 2013-11-11 16:16:34 +05:30
parent fb8c58a3cf
commit 1b2f1d7454
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/console-proxy-rdp/rdpconsole/src/main/java/streamer/SocketWrapper.java
View File

@ -133,7 +133,7 @@ public class SocketWrapper extends PipelineImpl {
sslContext.init(null, new TrustManager[] { new TrustAllX509TrustManager() }, null); sslContext.init(null, new TrustManager[] { new TrustAllX509TrustManager() }, null);
SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory(); 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(); sslSocket.startHandshake();
InputStream sis = sslSocket.getInputStream(); InputStream sis = sslSocket.getInputStream();

2
services/console-proxy-rdp/rdpconsole/src/test/java/rdpclient/MockServerTest.java
View File

@ -154,7 +154,7 @@ public class MockServerTest extends TestCase {
//System.setProperty("javax.net.debug", "ssl"); //System.setProperty("javax.net.debug", "ssl");
final SSLSocketFactory sslSocketFactory = (SSLSocketFactory) SSLSocketFactory.getDefault(); 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.setEnabledCipherSuites(sslSocket.getSupportedCipherSuites());
sslSocket.startHandshake(); sslSocket.startHandshake();

1
services/pom.xml
View File

@ -32,6 +32,7 @@
</build> </build>
<modules> <modules>
<module>console-proxy</module> <module>console-proxy</module>
<module>console-proxy-rdp/rdpconsole</module>
<module>secondary-storage</module> <module>secondary-storage</module>
</modules> </modules>
</project> </project>