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

[306989] [dstore] workspace in strange condition if expanding projects during logon

Browse source
This commit is contained in:
David McKnight 2010-03-25 18:02:21 +00:00
parent db54411058
commit 937e9abafa
1 changed files with 53 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2002, 2009 IBM Corporation and others. * Copyright (c) 2002, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -38,6 +38,7 @@
* 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 * 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
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.connectorservice.dstore; package org.eclipse.rse.connectorservice.dstore;
@ -1300,6 +1301,7 @@ public class DStoreConnectorService extends StandardConnectorService implements
} }
_isConnecting = true; _isConnecting = true;
try{
Boolean alertedNONSSL = new Boolean(false); Boolean alertedNONSSL = new Boolean(false);
// set A_PLUGIN_PATH so that dstore picks up the property // set A_PLUGIN_PATH so that dstore picks up the property
@ -1347,8 +1349,11 @@ public class DStoreConnectorService extends StandardConnectorService implements
else { // diagnosis, reconnection and other connection failure handling else { // diagnosis, reconnection and other connection failure handling
handleConnectionFailure(launchStatus, connectStatus, serverLauncher, serverLauncherType, monitor); handleConnectionFailure(launchStatus, connectStatus, serverLauncher, serverLauncherType, monitor);
} }
}
finally {
_isConnecting = false; _isConnecting = false;
} }
}
protected boolean isPortOutOfRange(String message) protected boolean isPortOutOfRange(String message)
{ {