mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 01:05:38 +02:00
Code Issues Wiki Activity

[313653] [dstore] Not Secured using SSL message appears twice per connect

Browse source
This commit is contained in:
David McKnight 2010-05-28 16:00:10 +00:00
parent 83cb17abf5
commit 2a71ce07e6
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,7 @@
* David McKnight (IBM) - [274688] [api][dstore] DStoreConnectorService.internalConnect() needs to be cleaned up * David McKnight (IBM) - [274688] [api][dstore] DStoreConnectorService.internalConnect() needs to be cleaned up
* David McKnight (IBM) - [258529] Unable to display connection failure error message * David McKnight (IBM) - [258529] Unable to display connection failure error message
* David McKnight (IBM) - [306989] [dstore] workspace in strange condition if expanding projects during logon * David McKnight (IBM) - [306989] [dstore] workspace in strange condition if expanding projects during logon
* David McKnight (IBM) - [313653] [dstore] Not Secured using SSL message appears twice per connect
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.connectorservice.dstore; package org.eclipse.rse.connectorservice.dstore;
@ -120,9 +121,12 @@ public class DStoreConnectorService extends StandardConnectorService implements
private class ConnectionStatusPair { private class ConnectionStatusPair {
private ConnectionStatus _connectStatus; private ConnectionStatus _connectStatus;
private ConnectionStatus _launchStatus; private ConnectionStatus _launchStatus;
public ConnectionStatusPair(ConnectionStatus connectStatus, ConnectionStatus launchStatus){ private Boolean _alertedNonSSL;
public ConnectionStatusPair(ConnectionStatus connectStatus, ConnectionStatus launchStatus, Boolean alertedNonSSL){
_connectStatus = connectStatus; _connectStatus = connectStatus;
_launchStatus = launchStatus; _launchStatus = launchStatus;
_alertedNonSSL = alertedNonSSL;
} }
public ConnectionStatus getConnectStatus(){ public ConnectionStatus getConnectStatus(){
@ -132,6 +136,10 @@ public class DStoreConnectorService extends StandardConnectorService implements
public ConnectionStatus getLaunchStatus(){ public ConnectionStatus getLaunchStatus(){
return _launchStatus; return _launchStatus;
} }
public Boolean getAlertedNonSSL(){
return _alertedNonSSL;
}
} }
private class StartSpiritThread extends Thread private class StartSpiritThread extends Thread
@ -792,7 +800,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
} }
} }
return new ConnectionStatusPair(connectStatus, launchStatus); return new ConnectionStatusPair(connectStatus, launchStatus, alertedNONSSL);
} }
/** /**
@ -1335,6 +1343,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
ConnectionStatusPair connectStatusPair = connectWithDaemon(info, serverLauncher, alertedNONSSL, monitor); ConnectionStatusPair connectStatusPair = connectWithDaemon(info, serverLauncher, alertedNONSSL, monitor);
connectStatus = connectStatusPair.getConnectStatus(); connectStatus = connectStatusPair.getConnectStatus();
launchStatus = connectStatusPair.getLaunchStatus(); launchStatus = connectStatusPair.getLaunchStatus();
alertedNONSSL = connectStatusPair.getAlertedNonSSL();
} }
else if (serverLauncherType == ServerLaunchType.RUNNING_LITERAL){ // connect to running server else if (serverLauncherType == ServerLaunchType.RUNNING_LITERAL){ // connect to running server
connectStatus = connectWithRunning(monitor); connectStatus = connectWithRunning(monitor);