Repository: incubator-apex-core
Updated Branches:
  refs/heads/devel-3.1 03f612ff8 -> 8493d5c87


APEX-89 #resolve escape configuration property name because it can contain 
characters that need to be escaped


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/9a5931d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/9a5931d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/9a5931d6

Branch: refs/heads/devel-3.1
Commit: 9a5931d6eaf2cca35b2105a7a62811e493d28768
Parents: 03f612f
Author: David Yan <[email protected]>
Authored: Thu Sep 3 10:33:19 2015 -0700
Committer: David Yan <[email protected]>
Committed: Thu Sep 3 10:35:02 2015 -0700

----------------------------------------------------------------------
 .../main/java/com/datatorrent/stram/client/StramClientUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/9a5931d6/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
----------------------------------------------------------------------
diff --git 
a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java 
b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
index 6bdff7c..34413e7 100644
--- a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
+++ b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
@@ -640,7 +640,7 @@ public class StramClientUtils
       context.evaluateString(scope, "var _prop = {}", "EvalLaunchProperties", 
0, null);
       for (Map.Entry<String, String> entry : vars) {
         LOG.info("Evaluating: {}", "_prop[\"" + entry.getKey() + "\"] = " + 
entry.getValue());
-        context.evaluateString(scope, "_prop[\"" + entry.getKey() + "\"] = \"" 
+ StringEscapeUtils.escapeJava(entry.getValue()) + "\"", 
"EvalLaunchProperties", 0, null);
+        context.evaluateString(scope, "_prop[\"" + 
StringEscapeUtils.escapeJava(entry.getKey())  + "\"] = \"" + 
StringEscapeUtils.escapeJava(entry.getValue()) + "\"", "EvalLaunchProperties", 
0, null);
       }
 
       for (Map.Entry<Object, Object> entry : target.entrySet()) {

Reply via email to