From e6a3f167019cde80bed127bb07fb56f11e629c1f Mon Sep 17 00:00:00 2001 From: "nboyd%atg.com" Date: Mon, 8 Jan 2001 01:03:23 +0000 Subject: [PATCH] Revert to old object identity for equality per ECMA. git-svn-id: svn://10.0.0.236/trunk@84541 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java | 7 +++++-- .../js/rhino/src/org/mozilla/javascript/ScriptRuntime.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java b/mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java index 146c7a99b13..3e88cfdf43f 100644 --- a/mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java +++ b/mozilla/js/rhino/org/mozilla/javascript/ScriptRuntime.java @@ -1582,8 +1582,11 @@ public class ScriptRuntime { if (typeX == ScriptableClass) { if (x == y) return true; - if (x instanceof Wrapper && y instanceof Wrapper) { - return ((Wrapper) x).unwrap().equals(((Wrapper) y).unwrap()); + if (x instanceof Wrapper && + y instanceof Wrapper) + { + return ((Wrapper) x).unwrap() == + ((Wrapper) y).unwrap(); } return false; } diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java index 146c7a99b13..3e88cfdf43f 100644 --- a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java +++ b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java @@ -1582,8 +1582,11 @@ public class ScriptRuntime { if (typeX == ScriptableClass) { if (x == y) return true; - if (x instanceof Wrapper && y instanceof Wrapper) { - return ((Wrapper) x).unwrap().equals(((Wrapper) y).unwrap()); + if (x instanceof Wrapper && + y instanceof Wrapper) + { + return ((Wrapper) x).unwrap() == + ((Wrapper) y).unwrap(); } return false; }