* Makefile.am (nat_source_files): Remove
java/io/natObjectOutputStream.cc.
* Makefile.in: Regenerated.
* mauve-libgcj: Don't exclude java.io.ObjectInputOutput tests.
* java/io/ObjectStreamField.java (typename): New field.
(ObjectStreamField(String, Class)): Initialize new field.
(ObjectStreamField(String, String)): New Constructor.
(getTypeCode): Use new field.
(getTypeString): Use new field.
* java/io/ObjectOutputStream.java (writeObject): Rethrow fatal
ObjectStreamExceptions. Remember and reset old BlockDataMode.
Handle reading of Proxy classes. Never drain(), just write
TC_ENDBLOCKDATA. Rethrow ObjectStreamExceptions.
(drain): Check writeDataAsBlocks before calling writeBlockDataHeader.
(flush): Call flush(), not just drain().
(writeBoolean): Always use blockDataOutput.
(writeByte): Likewise.
(writeShort): Likewise.
(writeChar): Likewise.
(writeInt): Likewise.
(writeLong): Likewise.
(writeFloat): Likewise.
(writeDouble): Likewise.
(writeBytes): Likewise.
(putfield (put(String,Object))): Throw IllegalArgumentException if
field cannot be found.
(putfield (write(ObjectOutput))): Remember old BlockDataMode.
(writeArraySizeAndElements): Write byte[] in one go.
(writeFields): Write TC_ENDBLOCKDATA when call_write_method, otherwise
set BlockDataMode to false.
(annotateProxyClass): New method.
(defaultProtocolVersion): Now defaults to PROTOCOL_VERSION_2
(getField): No longer native.
(getMethod): Likewise.
(setBlockDataMode): Always drain() on switch, return old mode.
(static): New static code block.
* java/io/natObjectOutputStream.cc: Removed.
* java/io/ObjectInputStream.java (getField): No longer native.
(getMethod): Likewise.
(readObject): Remember and reset old BlockDataMode. Track whether
object is consumed. Handle TC_ENDBLOCKDATA, TC_PROXYCLASSDESC and
TC_LONGSTRING.
(defaultReadObject): Set BlockDataMode to false during readFields.
(resolveClass): Create new SecurityManager if necessary.
Use Class.forName() if null ClassLoader found.
(read(byte[],int,int): Copy remaining bytes to data before calling
readNextBlock().
(readFields): Set and reset BlockDataMode on call_read_method.
Catch NoSuchFieldErrors.
(setBlockDataMode): Return old mode.
(static): New static code block.
* java/io/natObjectInputStream.cc (getField): Removed.
(getMethod): Likewise.
From-SVN: r63556
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| doc | Loading commit data... | |
| gcj | Loading commit data... | |
| gnu | Loading commit data... | |
| include | Loading commit data... | |
| java | Loading commit data... | |
| javax | Loading commit data... | |
| jni | Loading commit data... | |
| libltdl | Loading commit data... | |
| org | Loading commit data... | |
| scripts | Loading commit data... | |
| sysdep | Loading commit data... | |
| testsuite | Loading commit data... | |
| COPYING | Loading commit data... | |
| ChangeLog | Loading commit data... | |
| ChangeLog-1999 | Loading commit data... | |
| ChangeLog-2001 | Loading commit data... | |
| HACKING | Loading commit data... | |
| LIBGCJ_LICENSE | Loading commit data... | |
| Makefile.am | Loading commit data... | |
| Makefile.in | Loading commit data... | |
| NEWS | Loading commit data... | |
| README | Loading commit data... | |
| THANKS | Loading commit data... | |
| acconfig.h | Loading commit data... | |
| acinclude.m4 | Loading commit data... | |
| aclocal.m4 | Loading commit data... | |
| addr2name.awk | Loading commit data... | |
| boehm.cc | Loading commit data... | |
| configure | Loading commit data... | |
| configure.host | Loading commit data... | |
| configure.in | Loading commit data... | |
| defineclass.cc | Loading commit data... | |
| exception.cc | Loading commit data... | |
| gij.cc | Loading commit data... | |
| glib.m4 | Loading commit data... | |
| gtk.m4 | Loading commit data... | |
| interpret.cc | Loading commit data... | |
| jni.cc | Loading commit data... | |
| libart.m4 | Loading commit data... | |
| libgcj-test.spec.in | Loading commit data... | |
| libgcj.spec.in | Loading commit data... | |
| libtool-version | Loading commit data... | |
| mauve-libgcj | Loading commit data... | |
| no-threads.cc | Loading commit data... | |
| nogc.cc | Loading commit data... | |
| posix-threads.cc | Loading commit data... | |
| posix.cc | Loading commit data... | |
| prims.cc | Loading commit data... | |
| resolve.cc | Loading commit data... | |
| verify.cc | Loading commit data... | |
| win32-threads.cc | Loading commit data... | |
| win32.cc | Loading commit data... |