From 1226ebf3341f57414ffeffca2503498b9a364d36 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 26 Jul 2006 16:48:53 +0000 Subject: [PATCH] try non-ssl if there is a ssl handshake exception during with server --- .../connectorservice/dstore/DStoreConnectorService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 a9a4d1355ff..8fa08498cb4 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 @@ -22,6 +22,8 @@ import java.security.cert.X509Certificate; import java.util.List; import java.util.Vector; +import javax.net.ssl.SSLHandshakeException; + import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.dstore.core.client.ClientConnection; @@ -636,13 +638,16 @@ public class DStoreConnectorService extends AbstractConnectorService implements } // connect to launched server connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout); - if (!connectStatus.isConnected() && connectStatus.getMessage().startsWith(ClientConnection.CANNOT_CONNECT)) + + if (!connectStatus.isConnected() && + (connectStatus.getMessage().startsWith(ClientConnection.CANNOT_CONNECT) || + connectStatus.getException() instanceof SSLHandshakeException) + ) { launchStatus = launchServer(clientConnection, info, daemonPort, monitor); if (!launchStatus.isConnected()) { launchFailed = true; - SystemBasePlugin.logError("Error launching server: " + launchStatus.getMessage(), null); } else {