FYI: More serialization merges

[Mark Wielaard]

Hi,

Unfortunately some serialization classes are still not fully merge. But
ObjectStreamClass is now, so the special override can be removed. And I
ported two patches from classpath to ObjectInputStream to at least fix
the Mauve failures for Proxy and readResolve we were seeing after the
0.19 merge.

2005-11-15  Jeroen Frijters  <jeroen@frijters.net>

      * java/io/ObjectInputStream.java
      (parseContent): Removed bogus println and fixed bug #24422.

2005-11-15  Mark Wielaard  <mark@klomp.org>

      * java/io/ObjectStreamClass.java: Removed, fully merged now.
      * sources.am: Regenerated.
      * Makefile.in: Regenerated.

2005-11-15  Wolfgang Baer  <WBaer@gmx.de>

      * java/io/ObjectInputStream.java
      (processResolution): Pass Error, RuntimeException and
      ObjectStreamException through to the caller.
      (readObject): Documentation update.

There is more merging to do here, but I committed these already.

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: serial-merge.patch
Type: text/x-patch
Size: 32379 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/java-patches/attachments/20051116/02441389/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://gcc.gnu.org/pipermail/java-patches/attachments/20051116/02441389/attachment.sig>