#ignite-965: emit get second parameter as object instead of string.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/529d2e56 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/529d2e56 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/529d2e56 Branch: refs/heads/ignite-965 Commit: 529d2e56f42b83d60ee61a4d644a9d94e871f93f Parents: d20d903 Author: ivasilinets <[email protected]> Authored: Wed Jun 24 14:46:25 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Wed Jun 24 14:46:25 2015 +0300 ---------------------------------------------------------------------- .../handlers/scripting/IgniteScriptingCommandHandler.java | 10 ++-------- modules/nodejs/src/test/js/test-compute.js | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/529d2e56/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java index c03a48a..c43c81e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java @@ -167,7 +167,7 @@ public class IgniteScriptingCommandHandler extends GridRestCommandHandlerAdapter List task = (List)jobMapping; final String func = (String)task.get(0); - final List argv = (List)task.get(1); + final Object argv = task.get(1); ClusterNode node = (ClusterNode)task.get(2); map.put(new ComputeJobAdapter() { @@ -176,13 +176,7 @@ public class IgniteScriptingCommandHandler extends GridRestCommandHandlerAdapter @Override public Object execute() throws IgniteException { try { - String[] argv1 = new String[argv.size()]; - - for (int i = 0; i < argv1.length; ++i) - argv1[i] = argv.get(i).toString(); - - - return ((IgniteKernal)ignite).context().scripting().invokeFunction(func, argv1); + return ((IgniteKernal)ignite).context().scripting().invokeFunction(func, argv); } catch (IgniteCheckedException e) { throw U.convertException(e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/529d2e56/modules/nodejs/src/test/js/test-compute.js ---------------------------------------------------------------------- diff --git a/modules/nodejs/src/test/js/test-compute.js b/modules/nodejs/src/test/js/test-compute.js index 13b2ecf..0fe7842 100644 --- a/modules/nodejs/src/test/js/test-compute.js +++ b/modules/nodejs/src/test/js/test-compute.js @@ -67,7 +67,7 @@ function computeExecute(error, ignite) { return word.length; }; - emit(f, [words[i]], nodes[i % nodes.length]); + emit(f, words[i], nodes[i % nodes.length]); } };
