Repository: brooklyn-server Updated Branches: refs/heads/master 586795b32 -> 122c4eae8
Get rid of output from the classpath generation from stdin and env i.e. the Executed ... result 0. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/11593c0d Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/11593c0d Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/11593c0d Branch: refs/heads/master Commit: 11593c0dcb52ace19f1fb826911014e9d1645217 Parents: a941963 Author: Sam Corbett <[email protected]> Authored: Wed Jun 29 19:54:22 2016 +0100 Committer: Sam Corbett <[email protected]> Committed: Wed Jun 29 19:54:22 2016 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/11593c0d/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java index 5aa996c..26aed9c 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/VanillaJavaAppSshDriver.java @@ -101,8 +101,8 @@ public class VanillaJavaAppSshDriver extends JavaSoftwareProcessSshDriver implem ScriptHelper helper = newScript(CUSTOMIZING+"-classpath") .body.append(String.format("ls -1 \"%s\"", Os.mergePaths(getRunDir(), "lib"))) + .noExtraOutput() .gatherOutput(); - helper.setFlag(SshTool.PROP_NO_EXTRA_OUTPUT, true); int result = helper.execute(); if (result != 0) { throw new IllegalStateException("Error listing classpath files: " + helper.getResultStderr());
