2002-11-27 Julian Dolby <dolby@us.ibm.com>

	* java/util/Locale.java (toString): Improve efficiency if country
	and variant are both empty.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f8beb18..7bdb8eb 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-27  Julian Dolby  <dolby@us.ibm.com>
+
+       * java/util/Locale.java (toString): Improve efficiency if country
+       and variant are both empty.
+
 2002-11-26  Tom Tromey  <tromey@redhat.com>
 
        * verify.cc (pop_init_ref): New method.

diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java
index df5dac1..22e1938 100644 (file)
--- a/libjava/java/util/Locale.java
+++ b/libjava/java/util/Locale.java
@@ -420,6 +420,8 @@ public final class Locale implements Serializable, Cloneable
   {
     if (language.length() == 0 && country.length() == 0)
       return "";
+    else if (country.length() == 0 && variant.length() == 0)
+      return language;
     StringBuffer result = new StringBuffer(language);
     result.append('_').append(country);
     if (variant.length() != 0)