2004-03-11 Michael Koch <konqueror@gmx.de>

	* java/util/Locale.java
	(getISO3Language): Use String.equals() instead of ==.
	(getISO3Country): Likewise.

From-SVN: r79330

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2d741cf4468c87bf7c875b0e1d1dc9c851881cff..b92efd4c4007daf994843541be89037a6f176427 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-11  Michael Koch  <konqueror@gmx.de>
+
+       * java/util/Locale.java
+       (getISO3Language): Use String.equals() instead of ==.
+       (getISO3Country): Likewise.
+
 2004-03-11  Dalibor Topic  <robilad@kaffe.org>
 
        * java/text/AttributedString.java

diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java
index 06867fb020c4a2f79f6fb8ccc521cc2e96ccd7ec..c77f0cb9284840c65755638a201ff5bb392f59d2 100644 (file)
--- a/libjava/java/util/Locale.java
+++ b/libjava/java/util/Locale.java
@@ -436,7 +436,7 @@ public final class Locale implements Serializable, Cloneable
    */
   public String getISO3Language()
   {
-    if (language == "")
+    if (language.equals(""))
       return "";
     int index
       = ("aa,ab,af,am,ar,as,ay,az,ba,be,bg,bh,bi,bn,bo,br,ca,co,cs,cy,da,"
@@ -472,7 +472,7 @@ public final class Locale implements Serializable, Cloneable
    */
   public String getISO3Country()
   {
-    if (country == "")
+    if (country.equals(""))
       return "";
     int index
       = ("AD,AE,AF,AG,AI,AL,AM,AN,AO,AQ,AR,AS,AT,AU,AW,AZ,BA,BB,BD,BE,BF,"