From: Bryce McKinlay <mckinlay@redhat.com>
Date: Mon, 5 Jul 2004 22:33:24 +0000 (+0000)
Subject: Locale.java (readObject): Intern strings read from object stream.
X-Git-Tag: releases/gcc-4.0.0~7021
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a86f03720b3e13269d3e1f1853df4239ef0ffef1;p=thirdparty%2Fgcc.git

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 17c097b307ff..1a3822d1d515 100644
--- 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 ca6334cb3349..4e8883994ed9 100644
--- 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();
   }