brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [3/5] git commit: Add bash escaping for JAVA_OPTS
Date Fri, 06 Jun 2014 19:15:19 GMT
Add bash escaping for JAVA_OPTS


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c33099a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c33099a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c33099a3

Branch: refs/heads/master
Commit: c33099a36f30d873eba25f0389a1b54e3b52ae89
Parents: cbb166c
Author: Andrew Kennedy <andrew.kennedy@cloudsoftcorp.com>
Authored: Wed Jun 4 19:33:32 2014 +0100
Committer: Andrew Kennedy <andrew.kennedy@cloudsoftcorp.com>
Committed: Wed Jun 4 19:34:16 2014 +0100

----------------------------------------------------------------------
 .../java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c33099a3/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
index e342728..5a8df9e 100644
--- a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
@@ -88,8 +88,7 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
         // do not double quote here; the env var is double quoted subsequently;
         // spaces should be preceded by double-quote
         // (if dbl quotes are needed we could pass on the command-line instead of in an env
var)
-        String sJavaOpts = Joiner.on(" ").join(javaOpts);
-        // println "using java opts: $sJavaOpts"
+        String sJavaOpts = BashStringEscapes.doubleQuoteLiteralsForBash(javaOpts.toArray(new
String[0]));
         return MutableMap.<String, String>builder().putAll(super.getShellEnvironment()).put("JAVA_OPTS",
sJavaOpts).build();
     }
 


Mime
View raw message