orlikowski 2004/08/05 12:32:10
Modified: src/org/apache/bsf/engines/javascript JavaScriptEngine.java
Log:
RE-altering this, as per Igor's suggestion.
*However*, ScriptRuntime.emptyArgs is inconvertible to Scriptable.
For now, we create a throwaway BaseFunction.
Revision Changes Path
1.11 +4 -3
jakarta-bsf/src/org/apache/bsf/engines/javascript/JavaScriptEngine.java
Index: JavaScriptEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-bsf/src/org/apache/bsf/engines/javascript/JavaScriptEngine.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JavaScriptEngine.java 4 Aug 2004 12:12:32 -0000 1.10
+++ JavaScriptEngine.java 5 Aug 2004 19:32:10 -0000 1.11
@@ -60,14 +60,15 @@
import java.util.Vector;
import org.mozilla.javascript.Script;
+import org.mozilla.javascript.BaseFunction;
import org.mozilla.javascript.ClassDefinitionException;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.EvaluatorException;
-import org.mozilla.javascript.Function;
import org.mozilla.javascript.JavaScriptException;
import org.mozilla.javascript.PropertyException;
import org.mozilla.javascript.NativeJavaObject;
import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptRuntime;
import org.mozilla.javascript.ScriptableObject;
import org.mozilla.javascript.WrappedException;
import org.mozilla.javascript.Wrapper;
@@ -127,8 +128,8 @@
cx.setOptimizationLevel(0);
cx.setDebugger(null, null);
- Function function = (Function) fun;
- retval = function.call(cx, null, global, args);
+ retval =
+ ScriptRuntime.call(cx, fun, global, args, new BaseFunction());
if (retval instanceof Wrapper)
retval = ((Wrapper) retval).unwrap();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
