Modified to make sure that the SSH connection is closed in all possible scenarios

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java
index b3e9072a..96c2b5fc 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java
@@ -83,7 +83,7 @@ public class SshUtil {
 	
 	public boolean isPublicKeyInstalled(String serverName) {
 		try {
-			getConnection(serverName);
+			getConnectionWithPubKey(serverName).close();
 			return true;
 		} catch(ConnectionException e) {
 			return false;
@@ -172,6 +172,7 @@ public class SshUtil {
 	private synchronized Connection getConnectionWithPassword(String serverName) {
 		Connection conn = createConnection(serverName);
 		if(!authenticateWithPassword(conn)) {
+			conn.close();
 			throw new ConnectionException("SSH Authentication (password) failed for server ["
 					+ conn.getHostname() + "]");
 		}
@@ -181,6 +182,7 @@ public class SshUtil {
 	private synchronized Connection getConnectionWithPubKey(String serverName) {
 		Connection conn = createConnection(serverName);
 		if(!authenticateWithPublicKey(conn)) {
+			conn.close();
 			throw new ConnectionException("SSH Authentication (public key) failed for server ["
 					+ conn.getHostname() + "]");
 		}