Index: java/io/ObjectInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectInputStream.java,v
retrieving revision 1.49
diff -u -r1.49 ObjectInputStream.java
--- java/io/ObjectInputStream.java	6 Dec 2004 13:14:08 -0000	1.49
+++ java/io/ObjectInputStream.java	7 Dec 2004 08:47:45 -0000
@@ -293,7 +293,12 @@
 		  obj.readExternal(this);
 		  
 		  if (read_from_blocks)
-		    setBlockDataMode(oldmode);
+                    {
+		      setBlockDataMode(oldmode);
+                      if (!oldmode)
+			if (this.realInputStream.readByte() != TC_ENDBLOCKDATA)
+			    throw new IOException("No end of block data seen for class with readExternal (ObjectInputStream) method.");
+                    }
 		  
 		  ret_val = processResolution(osc, obj, handle);
 		  break;