From 7048d48b6ea81daf35d01a1ce966ec156f2b8a39 Mon Sep 17 00:00:00 2001
From: Abhinav Gupta <mail@abhinavg.net>
Date: Wed, 28 Sep 2011 20:30:06 +0000
Subject: [PATCH] ICU-8268 equals(Object o) methods assume that o is the
 correct type.

X-SVN-Rev: 30736
---
 .../src/com/ibm/icu/text/DateTimePatternGenerator.java    | 4 +++-
 .../core/src/com/ibm/icu/text/DecimalFormatSymbols.java   | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java
index 11719a92cfe..d90b05ac491 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java
@@ -2055,7 +2055,9 @@ public class DateTimePatternGenerator implements Freezable<DateTimePatternGenera
         }
 
         public boolean equals(Object other) {
-            if (other == null) return false;
+            if (!(other instanceof DateTimeMatcher)) {
+                return false;
+            }
             DateTimeMatcher that = (DateTimeMatcher) other;
             for (int i = 0; i < original.length; ++i) {
                 if (!original[i].equals(that.original[i])) return false;
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java
index b416bfa3eb5..c17a93d7671 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java
@@ -731,8 +731,12 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @stable ICU 2.0
      */
     public boolean equals(Object obj) {
-        if (obj == null) return false;
-        if (this == obj) return true;
+        if (!(obj instanceof DecimalFormatSymbols)) {
+            return false;
+        }
+        if (this == obj) {
+            return true;
+        }
         DecimalFormatSymbols other = (DecimalFormatSymbols) obj;
         for (int i = 0; i <= CURRENCY_SPC_INSERT; i++) {
             if (!currencySpcBeforeSym[i].equals(other.currencySpcBeforeSym[i])) {
-- 
2.40.0