From 91c6dda6c7acfeb8d9896557da02316109b0d05c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 9 Dec 2001 00:17:07 +0000 Subject: Makefile.in: Rebuilt. * Makefile.in: Rebuilt. * Makefile.am (java/lang/reflect/Method.h): ObjectInputStream now a friend. * java/lang/natClass.cc (getSignature): Only look at elements of non-null parameters. (getPrivateMethod): Removed old FIXME comment. * java/io/natObjectInputStream.cc (allocateObject): Removed old FIXME comment. (callConstructor): Simply use `NULL' for value of parameters. (ObjectClass): Removed. (ClassClass): Likewise. * java/io/ObjectInputStream.java (readObject): Fixed typo. From-SVN: r47800 --- libjava/java/io/ObjectInputStream.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libjava/java/io/ObjectInputStream.java') diff --git a/libjava/java/io/ObjectInputStream.java b/libjava/java/io/ObjectInputStream.java index e607975..7a67f3f 100644 --- a/libjava/java/io/ObjectInputStream.java +++ b/libjava/java/io/ObjectInputStream.java @@ -1,5 +1,5 @@ /* ObjectInputStream.java -- Class used to read serialized objects - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -225,13 +225,13 @@ public class ObjectInputStream extends InputStream { dumpElementln ("ARRAY"); ObjectStreamClass osc = (ObjectStreamClass)readObject (); - Class componenetType = osc.forClass ().getComponentType (); + Class componentType = osc.forClass ().getComponentType (); dumpElement ("ARRAY LENGTH="); int length = this.realInputStream.readInt (); - dumpElementln (length + "; COMPONENT TYPE=" + componenetType); - Object array = Array.newInstance (componenetType, length); + dumpElementln (length + "; COMPONENT TYPE=" + componentType); + Object array = Array.newInstance (componentType, length); int handle = assignNewHandle (array); - readArrayElements (array, componenetType); + readArrayElements (array, componentType); for (int i=0, len=Array.getLength(array); i < len; i++) dumpElementln (" ELEMENT[" + i + "]=" + Array.get(array, i).toString()); ret_val = processResolution (array, handle); @@ -1295,7 +1295,7 @@ public class ObjectInputStream extends InputStream // returns a new instance of REAL_CLASS that has been constructed - // only to th level of CONSTRUCTOR_CLASS (a super class of REAL_CLASS) + // only to the level of CONSTRUCTOR_CLASS (a super class of REAL_CLASS) private Object newObject (Class real_class, Class constructor_class) { try -- cgit v1.1