Attachment #110851 for bug #235284

Lines 34-39 Link Here

(-)src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java (-1 / +8 lines)
34	* David McKnight (IBM) - [235756] [dstore] Unable to connect to host with SSL via REXEC	34	* David McKnight (IBM) - [235756] [dstore] Unable to connect to host with SSL via REXEC
35	* David McKnight (IBM) - [244116] [dstore][daemon][ssl] Connecting to RSE server doesn't complete when the connection is SSL	35	* David McKnight (IBM) - [244116] [dstore][daemon][ssl] Connecting to RSE server doesn't complete when the connection is SSL
36	* David McKnight (IBM) - [233160] [dstore] SSL/non-SSL alert are not appropriate	36	* David McKnight (IBM) - [233160] [dstore] SSL/non-SSL alert are not appropriate
		37	* David Dykstal (IBM) [235284] Cancel password change causes problem
37	*******************************************************************************/	38	*******************************************************************************/
38		39
39	package org.eclipse.rse.connectorservice.dstore;	40	package org.eclipse.rse.connectorservice.dstore;
Lines 754-760 Link Here
754	}	755	}
755		756
756	SystemMessage message = createSystemMessage(msgId,IStatus.ERROR, pmsg, pmsgDetails);	757	SystemMessage message = createSystemMessage(msgId,IStatus.ERROR, pmsg, pmsgDetails);
757	getCredentialsProvider().repairCredentials(message);	758	try {
		759	getCredentialsProvider().repairCredentials(message);
		760	} catch (OperationCanceledException e) {
		761	_isConnecting = false;
		762	clientConnection = null;
		763	throw e;
		764	}
758	newCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials();	765	newCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials();
759	launchStatus = changePassword(clientConnection, oldCredentials, serverLauncher, monitor, newCredentials.getPassword());	766	launchStatus = changePassword(clientConnection, oldCredentials, serverLauncher, monitor, newCredentials.getPassword());
760	launchMsg = launchStatus.getMessage();	767	launchMsg = launchStatus.getMessage();

Lines 19-24 Link Here

(-)src/org/eclipse/dstore/core/client/ClientConnection.java (+13 lines)
19	* David McKnight (IBM) - [220892][dstore] Backward compatibility: Server and Daemon should support old clients	19	* David McKnight (IBM) - [220892][dstore] Backward compatibility: Server and Daemon should support old clients
20	* David McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types	20	* David McKnight (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
21	* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed	21	* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
		22	* David Dykstal (IBM) [235284] Cancel password change causes problem
22	*******************************************************************************/	23	*******************************************************************************/
23		24
24	package org.eclipse.dstore.core.client;	25	package org.eclipse.dstore.core.client;
Lines 121-126 Link Here
121	public final static String CLIENT_OLDER = "Older DataStore Client."; //$NON-NLS-1$	122	public final static String CLIENT_OLDER = "Older DataStore Client."; //$NON-NLS-1$
122	public final static String INCOMPATIBLE_PROTOCOL = "Incompatible Protocol."; //$NON-NLS-1$	123	public final static String INCOMPATIBLE_PROTOCOL = "Incompatible Protocol."; //$NON-NLS-1$
123	public final static String CANNOT_CONNECT = "Cannot connect to server."; //$NON-NLS-1$	124	public final static String CANNOT_CONNECT = "Cannot connect to server."; //$NON-NLS-1$
		125
		126	// TODO: should probably make this a public constant in 3.1
		127	private final static String INVALID_DAEMON_PORT_NUMBER = "Invalid daemon port number."; //$NON-NLS-1$
124		128
125	/**	129	/**
126	* Creates a new ClientConnection instance	130	* Creates a new ClientConnection instance
Lines 782-787 Link Here
782	result = new ConnectionStatus(false, e, true, mgr.getUntrustedCerts());	786	result = new ConnectionStatus(false, e, true, mgr.getUntrustedCerts());
783	return result;	787	return result;
784	}	788	}
		789	catch (IllegalArgumentException e) {
		790	e = new IllegalArgumentException(INVALID_DAEMON_PORT_NUMBER);
		791	result = new ConnectionStatus(false, e);
		792	return result;
		793	}
785	catch (Exception e)	794	catch (Exception e)
786	{	795	{
787	if (_launchSocket != null)	796	if (_launchSocket != null)
Lines 817-822 Link Here
817	{	826	{
818	result = new ConnectionStatus(false, uhe);	827	result = new ConnectionStatus(false, uhe);
819	}	828	}
		829	catch (IllegalArgumentException e) {
		830	e = new IllegalArgumentException(INVALID_DAEMON_PORT_NUMBER);
		831	result = new ConnectionStatus(false, e);
		832	}
820	catch (IOException ioe)	833	catch (IOException ioe)
821	{	834	{
822	result = new ConnectionStatus(false, ioe);	835	result = new ConnectionStatus(false, ioe);

Return to bug 235284