From 4e39e7feba3cfe17cdd1284031454cfdc053a80d Mon Sep 17 00:00:00 2001 From: "hannes%helma.at" Date: Thu, 30 Oct 2008 12:34:29 +0000 Subject: [PATCH] Fix bug 456546: Accept subclasses as argument to java method with o.m.j.Scriptable argument git-svn-id: svn://10.0.0.236/trunk@254826 18797224-902f-48f8-a5cc-f745e15eee43 --- .../js/rhino/src/org/mozilla/javascript/NativeJavaObject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaObject.java b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaObject.java index 847c9d3c49e..ee76af867cb 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaObject.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/NativeJavaObject.java @@ -370,7 +370,7 @@ WrapFactory#wrap(Context, Scriptable, Object, Class)} case JSTYPE_OBJECT: // Other objects takes #1-#3 spots - if (to == fromObj.getClass()) { + if (to.isInstance(fromObj)) { // No conversion required return 1; }