Author: mrdon
Date: Wed Oct 5 13:41:26 2005
New Revision: 295109
URL: http://svn.apache.org/viewcvs?rev=295109&view=rev
Log:
Fixing wrong function name
Modified:
struts/flow/trunk/src/java/org/apache/struts/flow/core/JavaScriptInterpreter.java
Modified:
struts/flow/trunk/src/java/org/apache/struts/flow/core/JavaScriptInterpreter.java
URL:
http://svn.apache.org/viewcvs/struts/flow/trunk/src/java/org/apache/struts/flow/core/JavaScriptInterpreter.java?rev=295109&r1=295108&r2=295109&view=diff
==============================================================================
---
struts/flow/trunk/src/java/org/apache/struts/flow/core/JavaScriptInterpreter.java
(original)
+++
struts/flow/trunk/src/java/org/apache/struts/flow/core/JavaScriptInterpreter.java
Wed Oct 5 13:41:26 2005
@@ -424,9 +424,9 @@
// this will produce a better error message
}
Object callFunArgs[] = {fun, funArgsArray};
- Object callFun = ScriptableObject.getProperty(thrScope,
"callFunction");
+ Object callFun = ScriptableObject.getProperty(thrScope,
"_callFunction");
if (callFun == Scriptable.NOT_FOUND) {
- callFun = "callFunction";
+ callFun = "_callFunction";
// this will produce a better error message
}
return ScriptRuntime.call(context, callFun, thrScope, callFunArgs,
thrScope);
@@ -680,12 +680,12 @@
reg = (VariableRegistrar) i.next();
if (reg.isCallSpecific()) {
WrapFactory factory = context.getWrapFactory();
- Object o = reg.getInstance(scope, chainCtx);
+ Object o = reg.getInstance(thrScope, chainCtx);
if (o instanceof Scriptable) {
- scope.put(reg.getName(), thrScope, (Scriptable)o);
+ thrScope.put(reg.getName(), thrScope, (Scriptable)o);
} else {
Scriptable var = factory.wrapAsJavaObject(context,
thrScope, o, reg.getClassInstance());
- scope.put(reg.getName(), thrScope, var);
+ thrScope.put(reg.getName(), thrScope, var);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
