diff options
| -rw-r--r-- | appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/src/main/java/org/onap/appc/adapter/ssh/sshd/SshConnectionSshd.java | 20 |
1 files changed, 7 insertions, 13 deletions
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; |