Use equals() instead of isInstance() when checking for redefinition

anba · anba · commit fa7e69f4a412 · 2012-06-04T18:37:00.000+02:00
diff --git a/src/org/mozilla/javascript/ScriptableObject.java b/src/org/mozilla/javascript/ScriptableObject.java
@@ -1298,7 +1298,7 @@ static <T extends Scriptable> BaseFunction buildClassCtor(
         Object existing = getProperty(getTopLevelScope(scope), className);
         if (existing instanceof BaseFunction) {
             Object existingProto = ((BaseFunction)existing).getPrototypeProperty();
-            if (clazz.isInstance(existingProto)) {
+            if (clazz.equals(existingProto.getClass())) {
                 return (BaseFunction)existing;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1298,7 +1298,7 @@ static <T extends Scriptable> BaseFunction buildClassCtor(`
`1298`	`1298`	`Object existing = getProperty(getTopLevelScope(scope), className);`
`1299`	`1299`	`if (existing instanceof BaseFunction) {`
`1300`	`1300`	`Object existingProto = ((BaseFunction)existing).getPrototypeProperty();`
`1301`		`- if (clazz.isInstance(existingProto)) {`
	`1301`	`+ if (clazz.equals(existingProto.getClass())) {`
`1302`	`1302`	`return (BaseFunction)existing;`
`1303`	`1303`	`}`
`1304`	`1304`	`}`