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

[274688] [api][dstore] DStoreConnectorService.internalConnect() needs to be cleaned up

Browse source
This commit is contained in:
David McKnight 2009-05-04 14:28:42 +00:00
parent 55e45a9d04
commit 0a3861b2bb
1 changed files with 50 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -816,6 +816,48 @@ public class DStoreConnectorService extends StandardConnectorService implements
return clientConnection.connect(null, timeout);
}
/**
* Connect via an overridden launchServer method
*
* @param clientConnection the clientConnection
* @param info the signon info
* @param serverLauncher the server launcher
* @param monitor the progress monitor
*
* @return the connection status
*
* @since 3.1
*/
protected ConnectionStatus connectWithOther(ClientConnection clientConnection, SystemSignonInformation info, IServerLauncherProperties serverLauncher, IProgressMonitor monitor) throws Exception {
ConnectionStatus connectStatus = launchServer(clientConnection, info, serverLauncher, monitor);
if (!connectStatus.isConnected() && !clientConnection.isKnownStatus(connectStatus.getMessage())){
if (connectStatus.isSLLProblem()){
if (setSSLProperties(true)){
connectStatus = launchServer(clientConnection, info, serverLauncher, monitor);
if (!connectStatus.isConnected() && connectStatus.isSLLProblem()){
List certs = connectStatus.getUntrustedCertificates();
if (certs != null && certs.size() > 0){ // we have untrusted certificates - so import them
ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
if (provider != null){
if (provider.importCertificates(certs, getHostName())){
return connectWithOther(clientConnection, info, serverLauncher, monitor);
}
else
{
_isConnecting = false;
throw new InterruptedException();
}
}
}
else { // SSL connect problem
return null;
}
}
}
}
}
return connectStatus;
}
/**
* Initialize the DataStore connection.
*
@ -1242,6 +1284,8 @@ public class DStoreConnectorService extends StandardConnectorService implements
}
/**
* @see org.eclipse.rse.core.subsystems.IConnectorService#connect(IProgressMonitor)
*/
@ -1286,34 +1330,23 @@ public class DStoreConnectorService extends StandardConnectorService implements
connectStatus = connectStatusPair.getConnectStatus();
launchStatus = connectStatusPair.getLaunchStatus();
if (connectStatus == null){
return; // error handling completed
}
//if (connectStatus == null){
// _isConnecting = false;
// return; // error handling completed
//}
}
else if (serverLauncherType == ServerLaunchType.RUNNING_LITERAL){ // connect to running server
connectStatus = connectWithRunning(monitor);
}
else { // server launcher type is unknown
connectStatus = launchServer(clientConnection, info, serverLauncher, monitor);
if (!connectStatus.isConnected() && !clientConnection.isKnownStatus(connectStatus.getMessage())){
if (connectStatus.isSLLProblem()){
if (setSSLProperties(true)){
connectStatus = launchServer(clientConnection, info, serverLauncher, monitor);
if (!connectStatus.isConnected() && connectStatus.isSLLProblem()){
_isConnecting = false;
importCertsAndReconnect(connectStatus, monitor);
return;
}
}
}
}
connectStatus = connectWithOther(clientConnection, info, serverLauncher, monitor);
}
if (connectStatus != null && connectStatus.isConnected()){ // connected
initializeConnection(launchStatus, connectStatus, alertedNONSSL, monitor);
}
else { // diagnosis, reconnection and other connection failure handling
handleConnectionFailure(connectStatus, launchStatus, serverLauncher, serverLauncherType, monitor);
handleConnectionFailure(launchStatus, connectStatus, serverLauncher, serverLauncherType, monitor);
}
_isConnecting = false;
}