From bc6ccd33161419ac05ed369d874a9d697805bcaa Mon Sep 17 00:00:00 2001 From: Warren Levy Date: Fri, 8 Sep 2000 19:37:09 +0000 Subject: PropertyChangeEvent.java (serialVersionUID): Added. * java/beans/PropertyChangeEvent.java (serialVersionUID): Added. * java/beans/PropertyVetoException.java (serialVersionUID): Added. * java/io/File.java (writeObject): Added. (readObject): Added. (serialVersionUID): Added. * java/io/ObjectOutputStream.java (writeObject): Initialized fieldsAlreadyWritten before recursion rather than after. * java/io/ObjectStreamClass.java (serialVersionUID): Added. * java/io/OptionalDataException.java (serialVersionUID): Added. (OptionalDataException): Made package private. * java/io/SyncFailedException.java (SyncFailedException): Removed default constructor to match spec. * java/lang/Boolean.java (serialVersionUID): Added. * java/lang/Byte.java (serialVersionUID): Added. * java/lang/Character.java (serialVersionUID): Added. * java/lang/Double.java (serialVersionUID): Added. * java/lang/Float.java (serialVersionUID): Added. * java/lang/Integer.java (serialVersionUID): Added. * java/lang/Long.java (serialVersionUID): Added. * java/lang/Number.java (serialVersionUID): Added. * java/lang/Short.java (serialVersionUID): Added. * java/lang/String.java (serialVersionUID): Added. * java/lang/ThreadDeath.java (ThreadDeath): Removed constructor to match spec. * java/lang/reflect/InvocationTargetException.java (serialVersionUID): Added. * java/net/URL.java (handler): Made transient. (hashCode): Added field for serialization, per spec. and use cached value if available. (serialVersionUID): Added. (URL): Initialize hashCode. (set): Adjust hashCode. (readObject): New Method to initialize the protocol handler when deserializing. (writeObject): New method. * java/text/BreakIterator.java: Removed 'implements Serializable'. * java/text/Collator.java: Removed 'implements Serializable'. * java/util/GregorianCalendar.java (serialVersionUID): Added. * java/util/Properties.java (serialVersionUID): Added. * java/util/Random.java (serialVersionUID): Added. (seed): Made private. (nextNextGaussian): Made private. (haveNextNextGaussian): Made private. * java/util/Stack.java (serialVersionUID): Added. * java/util/TimeZone.java (serialVersionUID): Added. * java/util/Vector.java (serialVersionUID): Added. Serialization mods. From-SVN: r36272 --- libjava/java/io/File.java | 20 ++++++++++++++++++++ libjava/java/io/ObjectOutputStream.java | 4 ++-- libjava/java/io/ObjectStreamClass.java | 4 ++++ libjava/java/io/OptionalDataException.java | 8 ++++++-- libjava/java/io/SyncFailedException.java | 5 ----- 5 files changed, 32 insertions(+), 9 deletions(-) (limited to 'libjava/java/io') diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java index 01d8d53..fc3477c 100644 --- a/libjava/java/io/File.java +++ b/libjava/java/io/File.java @@ -388,6 +388,24 @@ public class File implements Serializable FileDeleter.add (this); } + private void writeObject (ObjectOutputStream oos) throws IOException + { + oos.defaultWriteObject (); + oos.writeChar (separatorChar); + } + + private void readObject (ObjectInputStream ois) + throws ClassNotFoundException, IOException + { + ois.defaultReadObject (); + + // If the file was from an OS with a different dir separator, + // fixup the path to use the separator on this OS. + char oldSeparatorChar = ois.readChar (); + if (oldSeparatorChar != separatorChar) + path = path.replace (oldSeparatorChar, separatorChar); + } + // QUERY arguments to access function. private final static int READ = 0; private final static int WRITE = 1; @@ -404,4 +422,6 @@ public class File implements Serializable private final native long attr (String p, int query); private final native boolean access (String p, int query); private final native boolean stat (String p, int query); + + private static final long serialVersionUID = 301077366599181567L; } diff --git a/libjava/java/io/ObjectOutputStream.java b/libjava/java/io/ObjectOutputStream.java index c4ffc8c..664b882 100644 --- a/libjava/java/io/ObjectOutputStream.java +++ b/libjava/java/io/ObjectOutputStream.java @@ -313,12 +313,12 @@ public class ObjectOutputStream extends OutputStream { currentObjectStreamClass = hierarchy[i]; + fieldsAlreadyWritten = false; has_write = currentObjectStreamClass.hasWriteMethod (); + writeFields (obj, currentObjectStreamClass.fields, has_write); - fieldsAlreadyWritten = false; - if (has_write) { drain (); diff --git a/libjava/java/io/ObjectStreamClass.java b/libjava/java/io/ObjectStreamClass.java index 5bd867f..085c72b 100644 --- a/libjava/java/io/ObjectStreamClass.java +++ b/libjava/java/io/ObjectStreamClass.java @@ -635,6 +635,10 @@ public class ObjectStreamClass implements Serializable // these are accessed by ObjectIn/OutputStream int primFieldSize = -1; // -1 if not yet calculated int objectFieldCount; + + // This is probably not necessary because this class is special cased already + // but it will avoid showing up as a discrepancy when comparing SUIDs. + private static final long serialVersionUID = -6120832682080437368L; } diff --git a/libjava/java/io/OptionalDataException.java b/libjava/java/io/OptionalDataException.java index eabda73..ed4624b 100644 --- a/libjava/java/io/OptionalDataException.java +++ b/libjava/java/io/OptionalDataException.java @@ -23,12 +23,16 @@ public class OptionalDataException extends ObjectStreamException public boolean eof; public int length; - public OptionalDataException() + // FIXME: This can probably go away once the right signatures of + // these package private constructors is determined. + private static final long serialVersionUID = -8011121865681257820L; + + OptionalDataException() { super(); } - public OptionalDataException(String msg) + OptionalDataException(String msg) { super(msg); } diff --git a/libjava/java/io/SyncFailedException.java b/libjava/java/io/SyncFailedException.java index 05f4c3d..964d24a 100644 --- a/libjava/java/io/SyncFailedException.java +++ b/libjava/java/io/SyncFailedException.java @@ -22,11 +22,6 @@ package java.io; public class SyncFailedException extends IOException { - public SyncFailedException () - { - super (); - } - public SyncFailedException (String s) { super (s); -- cgit v1.1