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

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

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

From-SVN: r59590

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f8beb18ba927ea8c4c964b57dbbba32868345c40..7bdb8eb032e8f0a0767a9ade6cb95558146c83b1 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 df5dac15b375aa6f9b3b84bf778c2752b4fe42da..22e19384c59c94dbcd03806c849500fdd91bad69 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)