From 2522f3363d0ccbb714b010c6ce79eb698052cca3 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Sun, 16 Jan 2005 02:14:44 +0000 Subject: 2005-01-16 Andrew John Hughes * Merge of November 2004 HEAD patches to generics branch --- java/io/ObjectInputStream.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'java/io/ObjectInputStream.java') diff --git a/java/io/ObjectInputStream.java b/java/io/ObjectInputStream.java index 50ae29d74..fc3795696 100644 --- a/java/io/ObjectInputStream.java +++ b/java/io/ObjectInputStream.java @@ -331,6 +331,14 @@ public class ObjectInputStream extends InputStream boolean oldmode = setBlockDataMode(true); callReadMethod(readObjectMethod, this.currentObjectStreamClass.forClass(), obj); setBlockDataMode(oldmode); + } + else + { + readFields(obj, currentObjectStreamClass); + } + + if (this.currentObjectStreamClass.hasWriteMethod()) + { if(dump) dumpElement("ENDBLOCKDATA? "); try { @@ -353,10 +361,6 @@ public class ObjectInputStream extends InputStream if(dump) dumpElementln("no, got IOException"); } } - else - { - readFields(obj, currentObjectStreamClass); - } } this.currentObject = prevObject; -- cgit v1.2.1