From 8656214b84c3e789deffe8f7b465bd1c886b2a03 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@gcc.gnu.org>
Date: Wed, 16 Nov 2005 16:30:03 +0000
Subject: [multiple changes]

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.

From-SVN: r107088
---
 libjava/sources.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libjava/sources.am')

diff --git a/libjava/sources.am b/libjava/sources.am
index a4600e0..146c67e 100644
--- a/libjava/sources.am
+++ b/libjava/sources.am
@@ -2748,7 +2748,7 @@ java/io/ObjectInputStream.java \
 classpath/java/io/ObjectInputValidation.java \
 classpath/java/io/ObjectOutput.java \
 classpath/java/io/ObjectOutputStream.java \
-java/io/ObjectStreamClass.java \
+classpath/java/io/ObjectStreamClass.java \
 classpath/java/io/ObjectStreamConstants.java \
 classpath/java/io/ObjectStreamException.java \
 classpath/java/io/ObjectStreamField.java \
-- 
cgit v1.1