diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-12-09 00:17:07 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-12-09 00:17:07 +0000 |
| commit | 4eb3412b52d44f1f6209dc1ac596b4dc12b1c766 (patch) | |
| tree | 95fd70232045f8c0dde73b4269fe6f1381eb3062 /libjava/java/io/ObjectInputStream.java | |
| parent | b3ed5e82a401f5aa38bc1b7667a67d9b38e05cb4 (diff) | |
| download | gcc-4eb3412b52d44f1f6209dc1ac596b4dc12b1c766.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@47800 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/io/ObjectInputStream.java')
| -rw-r--r-- | libjava/java/io/ObjectInputStream.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libjava/java/io/ObjectInputStream.java b/libjava/java/io/ObjectInputStream.java index e607975aacb..7a67f3fb9a8 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 |