mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

ssl fix for linux client (from Michael Berger)

Browse source
This commit is contained in:
David McKnight 2006-04-25 19:12:06 +00:00
parent a50cc50ad8
commit f40f66a014
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -554,6 +554,8 @@ public class ClientConnection implements IDataStoreConstants
if (result == null && msg != null) if (result == null && msg != null)
{ {
result = new ConnectionStatus(false, msg); result = new ConnectionStatus(false, msg);
_isConnected = false;
_theSocket.close();
} }
} }
catch (java.net.ConnectException e) catch (java.net.ConnectException e)
@ -572,7 +574,6 @@ public class ClientConnection implements IDataStoreConstants
_isConnected = false; _isConnected = false;
result = new ConnectionStatus(_isConnected, ioe); result = new ConnectionStatus(_isConnected, ioe);
} }
return result; return result;
} }

6
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
View file

@ -633,11 +633,9 @@ public class DStoreConnectorService extends AbstractConnectorService implements
monitor.subTask(cmsg.getLevelOneText()); monitor.subTask(cmsg.getLevelOneText());
} }
// connect to launched server // connect to launched server
setSSLProperties(false);
connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout); connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout);
if (!connectStatus.isConnected() && connectStatus.getMessage().startsWith(ClientConnection.CANNOT_CONNECT)) if (!connectStatus.isConnected() && connectStatus.getMessage().startsWith(ClientConnection.CANNOT_CONNECT))
{ {
setSSLProperties(usedSSL);
launchStatus = launchServer(clientConnection, info, daemonPort, monitor); launchStatus = launchServer(clientConnection, info, daemonPort, monitor);
if (!launchStatus.isConnected()) if (!launchStatus.isConnected())
{ {
@ -646,7 +644,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
} }
else else
{ {
if (setSSLProperties(true)) if (setSSLProperties(!usedSSL))
{ {
connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout); connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout);
} }
@ -926,7 +924,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
} }
if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT)) if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT))
{ {
connect(monitor); internalConnect(monitor);
return; return;
} }
} }