From a828c3e10560daeda5feec685c1c494bca90d120 Mon Sep 17 00:00:00 2001 From: Julian Dolby Date: Wed, 27 Nov 2002 22:41:07 +0000 Subject: [PATCH] Locale.java (toString): Improve efficiency if country and variant are both empty. 2002-11-27 Julian Dolby * java/util/Locale.java (toString): Improve efficiency if country and variant are both empty. From-SVN: r59590 --- libjava/ChangeLog | 5 +++++ libjava/java/util/Locale.java | 2 ++ 2 files changed, 7 insertions(+) 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 + + * java/util/Locale.java (toString): Improve efficiency if country + and variant are both empty. + 2002-11-26 Tom Tromey * 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)