2003-06-18 Michael Koch <konqueror@gmx.de>

	* java/util/Locale.java
	(equals): Merged from classpath.

From-SVN: r68144

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 03cf46dc43cc561fbc0c918bf19cabff87f67976..67fb114328d073558877519ef8e36c786e81c748 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+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:

diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java
index 37dea4e69e8210e18e05e134e17a4bc75e5f40dc..60fdd0ad93b8db36e0eecbfa0cf386d385e1f0eb 100644 (file)
--- 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));