antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* If a script function returns an instance of org.mozilla.javascript.Wrapper

Browse source 
always unwrap it before processing/returning.
* If a script function returns null or undefined, return null even when
  invoke() was called in XML-RPC mode.
This commit is contained in:
hns 2003-12-09 16:34:05 +00:00
parent b85b9f206b
commit ae1aa70fdf
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/helma/scripting/rhino/RhinoEngine.java
View file

@ -262,12 +262,14 @@ public class RhinoEngine implements ScriptingEngine {
Object retval = ((Function) f).call(context, global, eso, args); Object retval = ((Function) f).call(context, global, eso, args);
if (xmlrpc) { if (retval instanceof Wrapper) {
return core.processXmlRpcResponse (retval); retval = ((Wrapper) retval).unwrap();
} else if ((retval == null) || (retval == Undefined.instance)) { }
if ((retval == null) || (retval == Undefined.instance)) {
return null; return null;
} else if (retval instanceof Wrapper) { } else if (xmlrpc) {
return ((Wrapper) retval).unwrap(); return core.processXmlRpcResponse (retval);
} else { } else {
return retval; return retval;
} }