From d704d3894ebd2e973168cb0f0ac0e3c74cddbdb1 Mon Sep 17 00:00:00 2001 From: "igor%mir2.org" Date: Mon, 3 Nov 2003 18:06:49 +0000 Subject: [PATCH] In NativeJavaClass.constructSpecific use passed scope, not function pointer as scope source so shared system scope with custom top scope and custom wrap factory would work. git-svn-id: svn://10.0.0.236/trunk@148780 18797224-902f-48f8-a5cc-f745e15eee43 --- .../rhino/src/org/mozilla/javascript/NativeJavaClass.java | 7 +++---- .../src/org/mozilla/javascript/NativeJavaConstructor.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaClass.java b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaClass.java index 4942649e87f..1f01592f73e 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaClass.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaClass.java @@ -181,7 +181,7 @@ public class NativeJavaClass extends NativeJavaObject implements Function { } // Found the constructor, so try invoking it. - return constructSpecific(cx, scope, this, args, ctors[index]); + return constructSpecific(cx, scope, args, ctors[index]); } else { Scriptable topLevel = ScriptableObject.getTopLevelScope(this); String msg = ""; @@ -208,11 +208,10 @@ public class NativeJavaClass extends NativeJavaObject implements Function { } static Scriptable constructSpecific(Context cx, Scriptable scope, - Scriptable thisObj, Object[] args, - MemberBox ctor) + Object[] args, MemberBox ctor) throws JavaScriptException { - Scriptable topLevel = ScriptableObject.getTopLevelScope(thisObj); + Scriptable topLevel = ScriptableObject.getTopLevelScope(scope); Class classObject = ctor.getDeclaringClass(); Class[] argTypes = ctor.argTypes; diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaConstructor.java b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaConstructor.java index 55c94a2c8df..0b7265f8bc7 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaConstructor.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaConstructor.java @@ -67,7 +67,7 @@ public class NativeJavaConstructor extends BaseFunction Object[] args) throws JavaScriptException { - return NativeJavaClass.constructSpecific(cx, scope, this, args, ctor); + return NativeJavaClass.constructSpecific(cx, scope, args, ctor); } public String toString()