You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/24 15:48:33 UTC
incubator-ignite git commit: #ignite-965: remove unused function
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-965 86723ffaf -> 916c13a41
#ignite-965: remove unused function
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/916c13a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/916c13a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/916c13a4
Branch: refs/heads/ignite-965
Commit: 916c13a418486d1b1037eced850c0c594ea8154e
Parents: 86723ff
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Jun 24 16:48:25 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Jun 24 16:48:25 2015 +0300
----------------------------------------------------------------------
.../scripting/IgniteScriptProcessor.java | 25 +++++---------------
1 file changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/916c13a4/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptProcessor.java
index 0bd7233..cd77537 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/scripting/IgniteScriptProcessor.java
@@ -100,7 +100,7 @@ public class IgniteScriptProcessor extends GridProcessorAdapter {
* @throws IgniteCheckedException If script failed.
*/
public Object invokeFunction(String src) throws IgniteCheckedException {
- return invokeFunctionByName("__internalCall", src);
+ return invokeFunction(src, null, null);
}
/**
@@ -110,7 +110,7 @@ public class IgniteScriptProcessor extends GridProcessorAdapter {
* @throws IgniteCheckedException If script failed.
*/
public Object invokeFunction(String src, Object arg) throws IgniteCheckedException {
- return invokeFunctionByName("__internalCall", src, arg);
+ return invokeFunction(src, arg, null);
}
/**
@@ -120,28 +120,15 @@ public class IgniteScriptProcessor extends GridProcessorAdapter {
* @throws IgniteCheckedException If script failed.
*/
public Object invokeFunction(String src, Object arg, Object arg2) throws IgniteCheckedException {
- return invokeFunctionByName("__internalCall", src, arg, arg2);
- }
-
- /**
- * Invoke function.
- *
- * @param nameFunc Function name.
- * @param args Function arguments.
- * @return Result of the function.
- * @throws IgniteCheckedException If script failed.
- */
- public Object invokeFunctionByName(String nameFunc, Object... args) throws IgniteCheckedException {
- Invocable invocable = (Invocable) jsEngine;
-
try {
- return invocable.invokeFunction(nameFunc, args);
+ Invocable invocable = (Invocable) jsEngine;
+ return invocable.invokeFunction("__internalCall", src, arg, arg2);
}
catch (ScriptException e) {
- throw new IgniteCheckedException("Function evaluation failed [funcName=" + nameFunc + "].");
+ throw new IgniteCheckedException("Function evaluation failed [funcName=" + src + "].");
}
catch (NoSuchMethodException e) {
- throw new IgniteCheckedException("Cannot find function [funcName=" + nameFunc + "].");
+ throw new IgniteCheckedException("Cannot find function [funcName=" + src + "].");
}
}
}