From: Michael Koch <konqueror@gmx.de>
Date: Wed, 18 Jun 2003 08:15:42 +0000 (+0000)
Subject: 2003-06-18  Michael Koch  <konqueror@gmx.de>
X-Git-Tag: releases/gcc-3.4.0~5689
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20d513ff665af54cc8fb5cac4d2f4fe86ea94259;p=thirdparty%2Fgcc.git

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 03cf46dc43cc..67fb114328d0 100644
--- 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 37dea4e69e82..60fdd0ad93b8 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));