diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/Locale.java | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 03cf46d..67fb114 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2003-06-18 Michael Koch <konqueror@gmx.de> + * java/util/Locale.java + (equals): Merged from classpath. + +2003-06-18 Michael Koch <konqueror@gmx.de> + * java/net/InetAddress.java: Reformatted to better match classpath's version. * java/net/URL.java diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java index 37dea4e..60fdd0a 100644 --- a/libjava/java/util/Locale.java +++ b/libjava/java/util/Locale.java @@ -723,9 +723,12 @@ public final class Locale implements Serializable, Cloneable */ public boolean equals(Object obj) { + if (this == obj) + return true; if (! (obj instanceof Locale)) return false; Locale l = (Locale) obj; + return (language.equals(l.language) && country.equals(l.country) && variant.equals(l.variant)); |