Attachment 111503 Details for Bug 235284 – Patch improving the error reporting from ClientConnection

[patch] Patch improving the error reporting from ClientConnection

bug235284_daemonIllegalArg.diff.txt (text/plain), 2.08 KB, created by Martin Oberhuber

on 2008-09-02 12:57:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Oberhuber

Created: 2008-09-02 12:57:11 EDT

Size: 2.08 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.dstore.core
>Index: src/org/eclipse/dstore/core/client/ClientConnection.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java,v
>retrieving revision 1.27
>diff -u -r1.27 ClientConnection.java
>--- src/org/eclipse/dstore/core/client/ClientConnection.java	26 Aug 2008 01:50:16 -0000	1.27
>+++ src/org/eclipse/dstore/core/client/ClientConnection.java	2 Sep 2008 16:51:13 -0000
>@@ -122,7 +122,7 @@
> 	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 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$
> 
>@@ -786,19 +786,17 @@
> 						result = new ConnectionStatus(false, e, true, mgr.getUntrustedCerts());
> 						return result;
> 					}
>-					catch (IllegalArgumentException e) {
>-						e = new IllegalArgumentException(INVALID_DAEMON_PORT_NUMBER);
>-						result = new ConnectionStatus(false, e);
>-						return result;
>-					}
> 					catch (Exception e)
> 					{
> 						if (_launchSocket != null)
> 						{
> 							_launchSocket.close();
> 						}
>-
>-						result = new ConnectionStatus(false, e);
>+						if (daemonPort <= 0 || daemonPort > 65535) {
>+							result = new ConnectionStatus(false, INVALID_DAEMON_PORT_NUMBER);
>+						} else {
>+							result = new ConnectionStatus(false, e);
>+						}
> 						return result;
> 					}
> 				}
>@@ -827,8 +825,7 @@
> 			result = new ConnectionStatus(false, uhe);
> 		}
> 		catch (IllegalArgumentException e) {
>-			e = new IllegalArgumentException(INVALID_DAEMON_PORT_NUMBER);
>-			result = new ConnectionStatus(false, e);
>+			result = new ConnectionStatus(false, INVALID_DAEMON_PORT_NUMBER);
> 		}
> 		catch (IOException ioe)
> 		{

Actions: View | Diff

Attachments on bug 235284: 110851 | 111503