From b5561639bb74ec381e6ab15c3821a61bbb037ca8 Mon Sep 17 00:00:00 2001
From: warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 27 Oct 2000 10:33:46 +0000
Subject: 	* Makefile.am: Added locale files from Classpath. 	*
 Makefile.in: Rebuilt. 	* gnu/java/locale/Calendar.java: New file. 	*
 gnu/java/locale/Calendar_de.java: New file. 	*
 gnu/java/locale/Calendar_en.java: New file. 	*
 gnu/java/locale/Calendar_nl.java: New file. 	*
 java/lang/ClassNotFoundException.java: Replaced with Classpath file. 	*
 java/math/BigDecimal.java (intVal): Renamed from 'num' for 	serialization
 compatibility. 	(scale): Made private. 	(serialVersionUID): New field.
 	* java/math/BigInteger.java (ival): Made transient. 	(words): Made
 transient. 	(bitCount): New serialization field. 	(bitLength): Ditto. 
 (firstNonzeroByteNum): Ditto. 	(lowestSetBit): Ditto. 	(magnitude): Ditto. 
 (signum): Ditto. 	(serialVersionUID): New field. 	(readObject): New
 method. 	(writeObject): New method. 	* java/util/BitSet.java
 (serialVersionUID): New field. 	* java/util/Calendar.java: Replaced
 with Classpath file. 	* java/util/GregorianCalendar.java
 (GregorianCalendar): Pass result 	of getDefault() for TimeZone or Locale
 instead of passing nulls. 	* java/util/Locale.java (serialVersionUID):
 New field. 	(writeObject): New method. 	(readObject): New method. 
 * java/util/SimpleTimeZone.java: Replaced with Classpath file.

Serialization mods.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37080 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/java/util/Locale.java | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'libjava/java/util/Locale.java')

diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java
index d2dc2f75917..c9e1e2cb0f5 100644
--- a/libjava/java/util/Locale.java
+++ b/libjava/java/util/Locale.java
@@ -26,6 +26,7 @@ public final class Locale implements java.io.Serializable, Cloneable
   private String language;
   private String variant;
   private static Locale defaultLocale;
+  private static final long serialVersionUID = 9149081749638150636L;
 
   // These are as specified in the JDK 1.2 AP documentation
 
@@ -145,4 +146,28 @@ public final class Locale implements java.io.Serializable, Cloneable
       }
     return result.toString();
   }
+
+ /**
+   * @serialdata According to jdk1.2 the hashcode should always be 
+   * written as -1; 
+   */
+  private void writeObject(java.io.ObjectOutputStream output)
+    throws java.io.IOException
+  {
+    int tmpHashcode = hashcode;
+    hashcode = -1;
+    output.defaultWriteObject();
+    hashcode = tmpHashcode;
+  }
+
+  /**
+   * @serialdata  According to jdk1.2 the hashCode is always invalid
+   * and must be recomputed.
+   */
+  private void readObject(java.io.ObjectInputStream input)
+    throws java.io.IOException, ClassNotFoundException
+  {
+    input.defaultReadObject();
+    hashcode = language.hashCode() ^ country.hashCode() ^ variant.hashCode();
+  }
 }
-- 
cgit v1.2.3