diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-27 22:41:07 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-27 22:41:07 +0000 |
commit | f04227bd88eab9a43d7774a1a767dcd487d524a3 (patch) | |
tree | ac097deb43305ca94aa86867cc2144ab95a3f03b /libjava | |
parent | c033ada4c0f6f240afbd386c1ade61444bc3adbf (diff) | |
download | gcc-f04227bd88eab9a43d7774a1a767dcd487d524a3.tar.gz |
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
Diffstat (limited to 'libjava')
-rw-r--r-- | libjava/ChangeLog | 5 | ||||
-rw-r--r-- | libjava/java/util/Locale.java | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f8beb18ba92..7bdb8eb032e 100644 --- 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 df5dac15b37..22e19384c59 100644 --- 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) |