2007-11-08 Jeroen Frijters <jeroen@frijters.net>

        * java/util/Locale.java
        (Locale): Always intern strings.

1 files changed, 5 insertions, 6 deletions

diff --git a/java/util/Locale.java b/java/util/Locale.java
index 846ae7baa..31973e485 100644
--- a/java/util/Locale.java
+++ b/java/util/Locale.java
@@ -324,13 +324,12 @@ public final class Locale implements Serializable, Cloneable
     // default locale.
     if (defaultLocale != null)
       {
-        language = convertLanguage(language).intern();
-        country = country.toUpperCase().intern();
-        variant = variant.intern();
+        language = convertLanguage(language);
+        country = country.toUpperCase();
       }
-    this.language = language;
-    this.country = country;
-    this.variant = variant;
+    this.language = language.intern();
+    this.country = country.intern();
+    this.variant = variant.intern();
     hashcode = language.hashCode() ^ country.hashCode() ^ variant.hashCode();
   }