From abe2472d2f091787f3a8af8b41501061bab0ef3a Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Thu, 5 Mar 2015 15:52:50 -0500 Subject: [PATCH] Bug 461249 - Avoid exceptions when attributes are not defined. Change-Id: I7c84e6070c9ce2572efbf74bde4453cee79c5db5 Signed-off-by: Greg Watson --- .../eclipse/remote/internal/jsch/core/JSchConnection.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java index 8cc3526fdc7..51ae3e13672 100644 --- a/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java +++ b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/remote/internal/jsch/core/JSchConnection.java @@ -556,7 +556,7 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC @Override public int getPort() { String portStr = fRemoteConnection.getAttribute(PORT_ATTR); - return portStr != null ? Integer.parseInt(portStr) : DEFAULT_PORT; + return !portStr.isEmpty() ? Integer.parseInt(portStr) : DEFAULT_PORT; } /* @@ -653,7 +653,7 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC public int getTimeout() { String str = fRemoteConnection.getAttribute(TIMEOUT_ATTR); - return str != null ? Integer.parseInt(str) : DEFAULT_TIMEOUT; + return !str.isEmpty() ? Integer.parseInt(str) : DEFAULT_TIMEOUT; } /* @@ -712,7 +712,7 @@ public class JSchConnection implements IRemoteConnectionControlService, IRemoteC public boolean isPasswordAuth() { String str = fRemoteConnection.getAttribute(IS_PASSWORD_ATTR); - return str != null ? Boolean.parseBoolean(str) : DEFAULT_IS_PASSWORD; + return !str.isEmpty() ? Boolean.parseBoolean(str) : DEFAULT_IS_PASSWORD; } private void loadEnv(IProgressMonitor monitor) throws RemoteConnectionException {