Locale.java (readObject): Intern strings read from object stream.

2004-07-05  Bryce McKinlay  <mckinlay@redhat.com>

	* java/util/Locale.java (readObject): Intern strings read from
	object stream.

From-SVN: r84137

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 17c097b307ff200794eec51dbb917e21619e3a3a..1a3822d1d515c7113f94ed28c53af058a8f74882 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-05  Bryce McKinlay  <mckinlay@redhat.com>
+
+       * java/util/Locale.java (readObject): Intern strings read from object
+       stream.
+
 2004-07-04  Michael Koch  <konqueror@gmx.de>
 
        * gnu/gcj/runtime/FirstThread.java,

diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java
index ca6334cb33497ffc46584544936a64e9e082bb34..4e8883994ed9d8ae4c1dc12e4a3e00a780ae11db 100644 (file)
--- a/libjava/java/util/Locale.java
+++ b/libjava/java/util/Locale.java
@@ -765,9 +765,9 @@ public final class Locale implements Serializable, Cloneable
   private void readObject(ObjectInputStream s)
     throws IOException, ClassNotFoundException
   {
-    language = (String) s.readObject();
-    country = (String) s.readObject();
-    variant = (String) s.readObject();    
+    language = ((String) s.readObject()).intern();
+    country = ((String) s.readObject()).intern();
+    variant = ((String) s.readObject()).intern();
     // Recompute hashcode.
     hashcode = language.hashCode() ^ country.hashCode() ^ variant.hashCode();
   }