From 1b1b26c9db1610aa287a0108b3392cedaaef1136 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Tue, 8 Jun 2004 21:19:51 +0000
Subject: [PATCH] Use Context.javaToJS() utility method to convert arguments in
 invoke()

---
 src/helma/scripting/rhino/RhinoEngine.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/helma/scripting/rhino/RhinoEngine.java b/src/helma/scripting/rhino/RhinoEngine.java
index 9b6260d6..3d5555e4 100644
--- a/src/helma/scripting/rhino/RhinoEngine.java
+++ b/src/helma/scripting/rhino/RhinoEngine.java
@@ -248,11 +248,9 @@ public class RhinoEngine implements ScriptingEngine {
             for (int i = 0; i < args.length; i++) {
                 switch (argsWrapMode) {
                     case ARGS_WRAP_DEFAULT:
-                        // wrap vanilla java objects unless they represent primitives
-                        if (args[i] != null && !(args[i] instanceof String)
-                                && !(args[i] instanceof Double
-                                && !(args[i] instanceof Boolean))) {
-                            args[i] = Context.toObject(args[i], global);
+                        // convert java objects to JavaScript
+                        if (args[i] != null) {
+                            args[i] = Context.javaToJS(args[i], global);
                         }
                         break;
                     case ARGS_WRAP_XMLRPC: