[SSHD-384] Fix broken client demo when executing a command Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/41b261c7 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/41b261c7 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/41b261c7
Branch: refs/heads/master Commit: 41b261c75a0e19e95dc328dd50b601b4429de8c8 Parents: 3b1308e Author: Guillaume Nodet <[email protected]> Authored: Fri Dec 12 10:52:04 2014 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Fri Dec 12 10:52:04 2014 +0100 ---------------------------------------------------------------------- sshd-core/src/main/java/org/apache/sshd/SshClient.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/41b261c7/sshd-core/src/main/java/org/apache/sshd/SshClient.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/SshClient.java b/sshd-core/src/main/java/org/apache/sshd/SshClient.java index 7156bf0..1b2e6aa 100644 --- a/sshd-core/src/main/java/org/apache/sshd/SshClient.java +++ b/sshd-core/src/main/java/org/apache/sshd/SshClient.java @@ -557,15 +557,12 @@ public class SshClient extends AbstractFactoryManager implements ClientFactoryMa ((ChannelShell) channel).setAgentForwarding(agentForward); channel.setIn(new NoCloseInputStream(System.in)); } else { - channel = session.createChannel(ClientChannel.CHANNEL_EXEC); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - Writer w = new OutputStreamWriter(baos); + StringWriter w = new StringWriter(); for (String cmd : command) { w.append(cmd).append(" "); } - w.append("\n"); w.close(); - channel.setIn(new ByteArrayInputStream(baos.toByteArray())); + channel = session.createChannel(ClientChannel.CHANNEL_EXEC, w.toString()); } channel.setOut(new NoCloseOutputStream(System.out)); channel.setErr(new NoCloseOutputStream(System.err));
