From 987c5c4efb7a064fb3fbd247355b2c49ad0efaef Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Thu, 1 Oct 2015 14:40:31 -0300 Subject: [PATCH] Bug 478843 - TelnetConnection should return default port and timeout Make TelnetConnection#getPort() and getTimout() return default port telnet (23) and timeout (0) if it isn't set with host services. Change-Id: I740cd6a10b1f34d7f1afb956578b97b7886f36cc Signed-off-by: Wainer dos Santos Moschetta --- .../org/eclipse/remote/telnet/core/TelnetConnection.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetConnection.java b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetConnection.java index f186ebb8a15..c1e37101978 100644 --- a/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetConnection.java +++ b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetConnection.java @@ -84,7 +84,8 @@ public class TelnetConnection implements IRemoteConnectionControlService, IRemot @Override public int getPort() { try { - return Integer.parseInt(remoteConnection.getAttribute(PORT_ATTR)); + String portStr = remoteConnection.getAttribute(PORT_ATTR); + return !portStr.isEmpty() ? Integer.parseInt(portStr) : DEFAULT_PORT; } catch (NumberFormatException e) { return -1; } @@ -93,7 +94,8 @@ public class TelnetConnection implements IRemoteConnectionControlService, IRemot @Override public int getTimeout() { try { - return Integer.parseInt(remoteConnection.getAttribute(TIMEOUT_ATTR)); + String timeoutStr = remoteConnection.getAttribute(TIMEOUT_ATTR); + return !timeoutStr.isEmpty() ? Integer.parseInt(timeoutStr) : DEFAULT_TIMEOUT; } catch (NumberFormatException e) { return -1; }