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

	* java/util/Locale.java: Reverting my last patch
	and add a comment why the original version was okay.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79511 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b3199d9..7570a45 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-15  Michael Koch  <konqueror@gmx.de>
+
+       * java/util/Locale.java: Reverting my last patch
+       and add a comment why the original version was okay.
+
 2004-03-14  Andreas Tobler <a.tobler@schweiz.ch>
 
        * gnu/java/nio/channels/natFileChannelPosix.cc: Implement

diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java
index c77f0cb..cc6d65f 100644 (file)
--- a/libjava/java/util/Locale.java
+++ b/libjava/java/util/Locale.java
@@ -436,7 +436,8 @@ public final class Locale implements Serializable, Cloneable
    */
   public String getISO3Language()
   {
-    if (language.equals(""))
+    // We know all strings are interned so we can use '==' for better performance.
+    if (language == "")
       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 +473,8 @@ public final class Locale implements Serializable, Cloneable
    */
   public String getISO3Country()
   {
-    if (country.equals(""))
+    // We know all strings are interned so we can use '==' for better performance.
+    if (country == "")
       return "";
     int index
       = ("AD,AE,AF,AG,AI,AL,AM,AN,AO,AQ,AR,AS,AT,AU,AW,AZ,BA,BB,BD,BE,BF,"