mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-17 22:15:23 +02:00
Code Issues Wiki Activity

[218685] [dstore] Unable to connect when using SSL.

Browse source
This commit is contained in:
David McKnight 2008-02-12 21:24:01 +00:00
parent ec70471613
commit e1d8704484
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java
View file

@ -13,6 +13,7 @@
* *
* Contributors: * Contributors:
* David McKnight (IBM) - [205986] daemon handshake needs a timeout * David McKnight (IBM) - [205986] daemon handshake needs a timeout
* David McKnight (IBM) - [218685] [dstore] Unable to connect when using SSL.
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.core.client; package org.eclipse.dstore.core.client;
@ -639,8 +640,7 @@ public class ClientConnection
public ConnectionStatus launchServer(String user, String password, int daemonPort, int timeout) public ConnectionStatus launchServer(String user, String password, int daemonPort, int timeout)
{ {
ConnectionStatus result = connectDaemon(daemonPort); ConnectionStatus result = connectDaemon(daemonPort, timeout);
boolean doTimeOut = timeout > 0;
if (!result.isConnected()) { if (!result.isConnected()) {
return result; return result;
} }
@ -652,7 +652,6 @@ public class ClientConnection
// create output stream for server launcher // create output stream for server launcher
try try
{ {
if (doTimeOut) _launchSocket.setSoTimeout(timeout);
writer = new PrintWriter(new OutputStreamWriter(_launchSocket.getOutputStream(), DE.ENCODING_UTF_8)); writer = new PrintWriter(new OutputStreamWriter(_launchSocket.getOutputStream(), DE.ENCODING_UTF_8));
writer.println(user); writer.println(user);
writer.println(password); writer.println(password);
@ -719,7 +718,7 @@ public class ClientConnection
* @param daemonPort the port of the daemon * @param daemonPort the port of the daemon
* @return the status of the connection * @return the status of the connection
*/ */
public ConnectionStatus connectDaemon(int daemonPort) { public ConnectionStatus connectDaemon(int daemonPort, int timeout) {
ConnectionStatus result = new ConnectionStatus(true); ConnectionStatus result = new ConnectionStatus(true);
try try
{ {
@ -739,7 +738,9 @@ public class ClientConnection
SSLSocket lSocket = (SSLSocket) factory.createSocket(_host, daemonPort); SSLSocket lSocket = (SSLSocket) factory.createSocket(_host, daemonPort);
_launchSocket = lSocket; _launchSocket = lSocket;
lSocket.setSoTimeout(10000); if (timeout > 0) {
_launchSocket.setSoTimeout(timeout);
}
lSocket.startHandshake(); lSocket.startHandshake();
SSLSession session = lSocket.getSession(); SSLSession session = lSocket.getSession();
@ -773,6 +774,9 @@ public class ClientConnection
else else
{ {
_launchSocket = new Socket(_host, daemonPort); _launchSocket = new Socket(_host, daemonPort);
if (timeout > 0) {
_launchSocket.setSoTimeout(timeout);
}
} }
} }
catch (java.net.ConnectException e) catch (java.net.ConnectException e)