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

[235284][dstore] Cancel password change causes problem

Browse source 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=235284
This commit is contained in:
David Dykstal 2008-08-26 01:50:16 +00:00
parent 09758be2bc
commit 17ff5fc373
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java
View file

@ -19,6 +19,7 @@
* David McKnight (IBM) - [220892][dstore] Backward compatibility: Server and Daemon should support old clients * David McKnight (IBM) - [220892][dstore] Backward compatibility: Server and Daemon should support old clients
* David McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types * David McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed * David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
* David Dykstal (IBM) [235284] Cancel password change causes problem
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.core.client; package org.eclipse.dstore.core.client;
@ -121,6 +122,9 @@ public class ClientConnection
public final static String CLIENT_OLDER = "Older DataStore Client."; //$NON-NLS-1$ public final static String CLIENT_OLDER = "Older DataStore Client."; //$NON-NLS-1$
public final static String INCOMPATIBLE_PROTOCOL = "Incompatible Protocol."; //$NON-NLS-1$ public final static String INCOMPATIBLE_PROTOCOL = "Incompatible Protocol."; //$NON-NLS-1$
public final static String CANNOT_CONNECT = "Cannot connect to server."; //$NON-NLS-1$ public final static String CANNOT_CONNECT = "Cannot connect to server."; //$NON-NLS-1$
// TODO: should probably make this a public constant in 3.1
private final static String INVALID_DAEMON_PORT_NUMBER = "Invalid daemon port number."; //$NON-NLS-1$
/** /**
* Creates a new ClientConnection instance * Creates a new ClientConnection instance
@ -782,6 +786,11 @@ public class ClientConnection
result = new ConnectionStatus(false, e, true, mgr.getUntrustedCerts()); result = new ConnectionStatus(false, e, true, mgr.getUntrustedCerts());
return result; return result;
} }
catch (IllegalArgumentException e) {
e = new IllegalArgumentException(INVALID_DAEMON_PORT_NUMBER);
result = new ConnectionStatus(false, e);
return result;
}
catch (Exception e) catch (Exception e)
{ {
if (_launchSocket != null) if (_launchSocket != null)
@ -817,6 +826,10 @@ public class ClientConnection
{ {
result = new ConnectionStatus(false, uhe); result = new ConnectionStatus(false, uhe);
} }
catch (IllegalArgumentException e) {
e = new IllegalArgumentException(INVALID_DAEMON_PORT_NUMBER);
result = new ConnectionStatus(false, e);
}
catch (IOException ioe) catch (IOException ioe)
{ {
result = new ConnectionStatus(false, ioe); result = new ConnectionStatus(false, ioe);

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

@ -34,6 +34,7 @@
* David McKnight (IBM) - [235756] [dstore] Unable to connect to host with SSL via REXEC * David McKnight (IBM) - [235756] [dstore] Unable to connect to host with SSL via REXEC
* David McKnight (IBM) - [244116] [dstore][daemon][ssl] Connecting to RSE server doesn't complete when the connection is SSL * David McKnight (IBM) - [244116] [dstore][daemon][ssl] Connecting to RSE server doesn't complete when the connection is SSL
* David McKnight (IBM) - [233160] [dstore] SSL/non-SSL alert are not appropriate * David McKnight (IBM) - [233160] [dstore] SSL/non-SSL alert are not appropriate
* David Dykstal (IBM) [235284] Cancel password change causes problem
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.connectorservice.dstore; package org.eclipse.rse.connectorservice.dstore;
@ -754,7 +755,13 @@ public class DStoreConnectorService extends StandardConnectorService implements
} }
SystemMessage message = createSystemMessage(msgId,IStatus.ERROR, pmsg, pmsgDetails); SystemMessage message = createSystemMessage(msgId,IStatus.ERROR, pmsg, pmsgDetails);
getCredentialsProvider().repairCredentials(message); try {
getCredentialsProvider().repairCredentials(message);
} catch (OperationCanceledException e) {
_isConnecting = false;
clientConnection = null;
throw e;
}
newCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials(); newCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials();
launchStatus = changePassword(clientConnection, oldCredentials, serverLauncher, monitor, newCredentials.getPassword()); launchStatus = changePassword(clientConnection, oldCredentials, serverLauncher, monitor, newCredentials.getPassword());
launchMsg = launchStatus.getMessage(); launchMsg = launchStatus.getMessage();