You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by cs...@apache.org on 2015/09/03 22:19:07 UTC
[1/2] incubator-apex-core git commit: APEX-89 #resolve escape
configuration property name because it can contain characters that need to be
escaped
Repository: incubator-apex-core
Updated Branches:
refs/heads/devel-3 55a068fd1 -> bff4c5bad
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/48515eb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/48515eb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/48515eb3
Branch: refs/heads/devel-3
Commit: 48515eb337701fac74c25a6b5172b71f5da80771
Parents: 55a068f
Author: David Yan <da...@datatorrent.com>
Authored: Thu Sep 3 10:33:19 2015 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Thu Sep 3 10:33:19 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/48515eb3/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 d21f03d..d596a73 100644
--- a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
+++ b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
@@ -642,7 +642,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()) {
[2/2] incubator-apex-core git commit: Merge branch 'APEX-89' into
devel-3-main
Posted by cs...@apache.org.
Merge branch 'APEX-89' into devel-3-main
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/bff4c5ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/bff4c5ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/bff4c5ba
Branch: refs/heads/devel-3
Commit: bff4c5bad97c03c09e85dcbc18a7789e07224c84
Parents: 55a068f 48515eb
Author: Chandni Singh <cs...@apache.org>
Authored: Thu Sep 3 13:18:17 2015 -0700
Committer: Chandni Singh <cs...@apache.org>
Committed: Thu Sep 3 13:18:17 2015 -0700
----------------------------------------------------------------------
.../main/java/com/datatorrent/stram/client/StramClientUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------