one last cleanup before merge #2009 #1883

karatelabs · Aug 2, 2022 · 763590e · 763590e
1 parent 5cee841
commit 763590e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/karate-core/src/main/java/com/intuit/karate/graal/JsEngine.java b/karate-core/src/main/java/com/intuit/karate/graal/JsEngine.java
@@ -116,9 +116,6 @@ public JsEngine copy() {
             Value v = bindings.getMember(key);
             if (v.isHostObject()) {
                 temp.bindings.putMember(key, v);
-//            } else if (v.canExecute()) {
-//                Value fun = temp.evalForValue("(" + v.getSourceLocation().getCharacters() + ")");
-//                temp.bindings.putMember(key, fun);
             } else {
                 temp.bindings.putMember(key, JsValue.toJava(v));
             }

diff --git a/karate-core/src/main/java/com/intuit/karate/graal/JsValue.java b/karate-core/src/main/java/com/intuit/karate/graal/JsValue.java
@@ -385,7 +385,7 @@ public boolean removeMember(String key) {
 
     public static final Object LOCK = new Object();
 
-    public static class SharableMembersAndExecutable extends SharableMembers implements ProxyExecutable {
+    static class SharableMembersAndExecutable extends SharableMembers implements ProxyExecutable {
 
         SharableMembersAndExecutable(Value v) {
             super(v);
@@ -406,7 +406,7 @@ public Object execute(Value... args) {
 
     }
 
-    public static class SharableMembersAndInstantiable extends SharableMembersAndExecutable implements ProxyInstantiable {
+    static class SharableMembersAndInstantiable extends SharableMembersAndExecutable implements ProxyInstantiable {
 
         SharableMembersAndInstantiable(Value v) {
             super(v);
@@ -415,10 +415,13 @@ public static class SharableMembersAndInstantiable extends SharableMembersAndExe
         @Override
         public Object newInstance(Value... args) {
             Object[] newArgs = new Object[args.length];
-            for (int i = 0; i < newArgs.length; i++) {
-                newArgs[i] = new JsValue(args[i]).value;
+            // the synchronized block should include the pre-processing of arguments
+            synchronized (LOCK) {            
+                for (int i = 0; i < newArgs.length; i++) {
+                    newArgs[i] = new JsValue(args[i]).value;
+                }
+                return new JsValue(v.execute(newArgs)).value;
             }
-            return new JsValue(v.execute(newArgs)).value;
         }
 
     }