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

[235284][dstore] Safer error reporting for invalid daemon port number

Browse source
This commit is contained in:
Martin Oberhuber 2008-09-04 09:56:31 +00:00
parent 1484919e21
commit 5ff3e6882d
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,7 +122,7 @@ 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 // 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$ private final static String INVALID_DAEMON_PORT_NUMBER = "Invalid daemon port number."; //$NON-NLS-1$
@ -786,19 +786,17 @@ 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)
{ {
_launchSocket.close(); _launchSocket.close();
} }
if (daemonPort <= 0 || daemonPort > 65535) {
result = new ConnectionStatus(false, e); result = new ConnectionStatus(false, INVALID_DAEMON_PORT_NUMBER);
} else {
result = new ConnectionStatus(false, e);
}
return result; return result;
} }
} }
@ -827,8 +825,7 @@ public class ClientConnection
result = new ConnectionStatus(false, uhe); result = new ConnectionStatus(false, uhe);
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {
e = new IllegalArgumentException(INVALID_DAEMON_PORT_NUMBER); result = new ConnectionStatus(false, INVALID_DAEMON_PORT_NUMBER);
result = new ConnectionStatus(false, e);
} }
catch (IOException ioe) catch (IOException ioe)
{ {