From: Driptaroop Das <driptaroop.das@in.ibm.com>
Date: Sun, 17 Mar 2019 19:07:21 +0000 (+0530)
Subject: SshConnectionSshd - Sonar Fix
X-Git-Tag: 1.5.0~70
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a699370368538fc5af70e2e34427fb93a1e25eb6;p=appc.git

SshConnectionSshd - Sonar Fix

SshConnectionSshd - Sonar Fix

Issue-ID: APPC-1543
Change-Id: Id02cd65f4dfeebb43c4eb637d50b649c684397c7
Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
---

diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/onap/appc/adapter/ssh/sshd/SshConnectionSshd.java b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/onap/appc/adapter/ssh/sshd/SshConnectionSshd.java
index 299ad7755..ee446084b 100644
--- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/onap/appc/adapter/ssh/sshd/SshConnectionSshd.java
+++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/onap/appc/adapter/ssh/sshd/SshConnectionSshd.java
@@ -173,28 +173,22 @@ class SshConnectionSshd implements SshConnection {
     }
 
     private int execCommand(String cmd, OutputStream out, OutputStream err, boolean usePty) {
-        try {
+        try(ChannelExec client = clientSession.createExecChannel(cmd)) {
             if (logger.isDebugEnabled()) {
                 logger.debug("SSH: executing command");
             }
-            ChannelExec client = clientSession.createExecChannel(cmd);
             client.setUsePty(usePty); // use pseudo-tty?
             client.setOut(out);
             client.setErr(err);
             OpenFuture openFuture = client.open();
             int exitStatus;
-            try {
-                client.waitFor(Arrays.asList(ClientChannelEvent.CLOSED), timeout);
-                openFuture.verify();
-                Integer exitStatusI = client.getExitStatus();
-                if (exitStatusI == null) {
-                    throw new SshException("Error executing command [" + cmd + "] over SSH [" + username + "@" + host
-                        + ":" + port + "]. Operation timed out.");
-                }
-                exitStatus = exitStatusI;
-            } finally {
-                client.close(false);
+            client.waitFor(Arrays.asList(ClientChannelEvent.CLOSED), timeout);
+            openFuture.verify();
+            Integer exitStatusI = client.getExitStatus();
+            if (exitStatusI == null) {
+                throw new SshException("Error executing command [" + cmd + "] over SSH [" + username + "@" + host + ":" + port + "]. Operation timed out.");
             }
+            exitStatus = exitStatusI;
             return exitStatus;
         } catch (RuntimeException e) {
             throw e;