From f40f66a0141b278b6ce2a0de086cfa1346a90756 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 25 Apr 2006 19:12:06 +0000 Subject: [PATCH] ssl fix for linux client (from Michael Berger) --- .../org/eclipse/dstore/core/client/ClientConnection.java | 3 ++- .../rse/connectorservice/dstore/DStoreConnectorService.java | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java index baf748d5ba8..4217c82a7d6 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java @@ -554,6 +554,8 @@ public class ClientConnection implements IDataStoreConstants if (result == null && msg != null) { result = new ConnectionStatus(false, msg); + _isConnected = false; + _theSocket.close(); } } catch (java.net.ConnectException e) @@ -572,7 +574,6 @@ public class ClientConnection implements IDataStoreConstants _isConnected = false; result = new ConnectionStatus(_isConnected, ioe); } - return result; } diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java index 2613211f558..b792634194a 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java @@ -633,11 +633,9 @@ public class DStoreConnectorService extends AbstractConnectorService implements monitor.subTask(cmsg.getLevelOneText()); } // connect to launched server - setSSLProperties(false); connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout); if (!connectStatus.isConnected() && connectStatus.getMessage().startsWith(ClientConnection.CANNOT_CONNECT)) { - setSSLProperties(usedSSL); launchStatus = launchServer(clientConnection, info, daemonPort, monitor); if (!launchStatus.isConnected()) { @@ -646,7 +644,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements } else { - if (setSSLProperties(true)) + if (setSSLProperties(!usedSSL)) { connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout); } @@ -926,7 +924,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements } if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT)) { - connect(monitor); + internalConnect(monitor); return; } }