mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

[258529] Unable to display connection failure error message

Browse source
This commit is contained in:
David McKnight 2009-05-04 19:54:47 +00:00
parent 0a3861b2bb
commit beb7986bd0
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,6 +37,7 @@
* David Dykstal (IBM) [235284] Cancel password change causes problem * David Dykstal (IBM) [235284] Cancel password change causes problem
* David McKnight (IBM) - [267236] [dstore] Can't connect after a wrong password * David McKnight (IBM) - [267236] [dstore] Can't connect after a wrong password
* 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
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.connectorservice.dstore; package org.eclipse.rse.connectorservice.dstore;
@ -1207,6 +1208,9 @@ public class DStoreConnectorService extends StandardConnectorService implements
String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName()); String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName());
msg = createSystemMessage(ICommonMessageIds.MSG_CONNECT_FAILED, IStatus.ERROR, msgTxt, exception); msg = createSystemMessage(ICommonMessageIds.MSG_CONNECT_FAILED, IStatus.ERROR, msgTxt, exception);
} }
else if (connectStatus.getMessage() != null){
msg = createSystemMessage(ICommonMessageIds.MSG_CONNECT_FAILED, IStatus.ERROR, connectStatus.getMessage());
}
} }
} }
@ -1329,11 +1333,6 @@ 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();
//if (connectStatus == null){
// _isConnecting = false;
// return; // error handling completed
//}
} }
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);