Fix sshj async-exec Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f8c76460 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f8c76460 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f8c76460
Branch: refs/heads/master Commit: f8c764605f3e7054d33c5278bf25e735a4e1e9d8 Parents: eef749c Author: Aled Sage <[email protected]> Authored: Tue Dec 13 14:41:39 2016 +0000 Committer: Aled Sage <[email protected]> Committed: Tue Dec 13 14:41:39 2016 +0000 ---------------------------------------------------------------------- .../apache/brooklyn/util/core/internal/ssh/ShellAbstractTool.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f8c76460/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/ShellAbstractTool.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/ShellAbstractTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/ShellAbstractTool.java index de94c98..d641478 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/ShellAbstractTool.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/ShellAbstractTool.java @@ -428,7 +428,8 @@ public abstract class ShellAbstractTool implements ShellTool { cmdParts.add( //ignore error output for the case where there are no running processes and kill is called without arguments "ps aux | grep \"tail -c\" | grep \""+stdoutPath+"\" | grep -v grep | awk '{ printf $2 }' | xargs kill 2> /dev/null", - "ps aux | grep \"tail -c\" | grep \""+stderrPath+"\" | grep -v grep | awk '{ printf $2 }' | xargs kill 2> /dev/null"); + "ps aux | grep \"tail -c\" | grep \""+stderrPath+"\" | grep -v grep | awk '{ printf $2 }' | xargs kill 2> /dev/null", + "exit 0"); String cmd = Joiner.on("\n").join(cmdParts.build());
