summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2013-07-15 12:11:27 +0200
committerAndrew Branson <andrew.branson@cern.ch>2013-07-15 12:11:27 +0200
commit1a22a3ef0b4a81edd80a3e9a83676d10ca73eb1a (patch)
tree5c85e507e090785f15c9eebdd91e5ece44dcbd63
parent1b3656d44c059ed8db4d9c24b1be2ad526e9b866 (diff)
Slacken the module script return type to Object, so it doesn't complain
with default returns
-rw-r--r--src/main/java/com/c2kernel/scripting/Script.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/com/c2kernel/scripting/Script.java b/src/main/java/com/c2kernel/scripting/Script.java
index 4faade5..1a755ea 100644
--- a/src/main/java/com/c2kernel/scripting/Script.java
+++ b/src/main/java/com/c2kernel/scripting/Script.java
@@ -97,9 +97,18 @@ public class Script
mScript = expr;
}
+ /**
+ * Creates a script executor requiring an agent to be set. Used by module event scripts.
+ *
+ * @param lang - script language
+ * @param name - script name for debugging
+ * @param expr - the script to run
+ * @param agent - the agentproxy to pass into the script as 'agent'
+ * @throws ScriptingEngineException
+ */
public Script(String lang, String name, String expr, AgentProxy agent) throws ScriptingEngineException
{
- this(lang, expr, ErrorInfo.class);
+ this(lang, expr, Object.class);
mName = name;
addInputParam("agent", AgentProxy.class);
setInputParamValue("agent", agent);