* 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 |
|---|---|---|
| .. | ||
| BufferedInputStream.java | Loading commit data... | |
| BufferedOutputStream.java | Loading commit data... | |
| BufferedReader.java | Loading commit data... | |
| BufferedWriter.java | Loading commit data... | |
| ByteArrayInputStream.java | Loading commit data... | |
| ByteArrayOutputStream.java | Loading commit data... | |
| CharArrayReader.java | Loading commit data... | |
| CharArrayWriter.java | Loading commit data... | |
| CharConversionException.java | Loading commit data... | |
| DataInput.java | Loading commit data... | |
| DataInputStream.java | Loading commit data... | |
| DataOutput.java | Loading commit data... | |
| DataOutputStream.java | Loading commit data... | |
| EOFException.java | Loading commit data... | |
| Externalizable.java | Loading commit data... | |
| File.java | Loading commit data... | |
| FileDescriptor.java | Loading commit data... | |
| FileFilter.java | Loading commit data... | |
| FileInputStream.java | Loading commit data... | |
| FileNotFoundException.java | Loading commit data... | |
| FileOutputStream.java | Loading commit data... | |
| FilePermission.java | Loading commit data... | |
| FileReader.java | Loading commit data... | |
| FileWriter.java | Loading commit data... | |
| FilenameFilter.java | Loading commit data... | |
| FilterInputStream.java | Loading commit data... | |
| FilterOutputStream.java | Loading commit data... | |
| FilterReader.java | Loading commit data... | |
| FilterWriter.java | Loading commit data... | |
| IOException.java | Loading commit data... | |
| InputStream.java | Loading commit data... | |
| InputStreamReader.java | Loading commit data... | |
| InterruptedIOException.java | Loading commit data... | |
| InvalidClassException.java | Loading commit data... | |
| InvalidObjectException.java | Loading commit data... | |
| LineNumberInputStream.java | Loading commit data... | |
| LineNumberReader.java | Loading commit data... | |
| NotActiveException.java | Loading commit data... | |
| NotSerializableException.java | Loading commit data... | |
| ObjectInput.java | Loading commit data... | |
| ObjectInputStream.java | Loading commit data... | |
| ObjectInputValidation.java | Loading commit data... | |
| ObjectOutput.java | Loading commit data... | |
| ObjectOutputStream.java | Loading commit data... | |
| ObjectStreamClass.java | Loading commit data... | |
| ObjectStreamConstants.java | Loading commit data... | |
| ObjectStreamException.java | Loading commit data... | |
| ObjectStreamField.java | Loading commit data... | |
| OptionalDataException.java | Loading commit data... | |
| OutputStream.java | Loading commit data... | |
| OutputStreamWriter.java | Loading commit data... | |
| PipedInputStream.java | Loading commit data... | |
| PipedOutputStream.java | Loading commit data... | |
| PipedReader.java | Loading commit data... | |
| PipedWriter.java | Loading commit data... | |
| PrintStream.java | Loading commit data... | |
| PrintWriter.java | Loading commit data... | |
| PushbackInputStream.java | Loading commit data... | |
| PushbackReader.java | Loading commit data... | |
| RandomAccessFile.java | Loading commit data... | |
| Reader.java | Loading commit data... | |
| SequenceInputStream.java | Loading commit data... | |
| Serializable.java | Loading commit data... | |
| SerializablePermission.java | Loading commit data... | |
| StreamCorruptedException.java | Loading commit data... | |
| StreamTokenizer.java | Loading commit data... | |
| StringBufferInputStream.java | Loading commit data... | |
| StringReader.java | Loading commit data... | |
| StringWriter.java | Loading commit data... | |
| SyncFailedException.java | Loading commit data... | |
| UTFDataFormatException.java | Loading commit data... | |
| UnsupportedEncodingException.java | Loading commit data... | |
| VMObjectStreamClass.java | Loading commit data... | |
| WriteAbortedException.java | Loading commit data... | |
| Writer.java | Loading commit data... | |
| natFileDescriptorEcos.cc | Loading commit data... | |
| natFileDescriptorPosix.cc | Loading commit data... | |
| natFileDescriptorWin32.cc | Loading commit data... | |
| natFilePosix.cc | Loading commit data... | |
| natFileWin32.cc | Loading commit data... | |
| natObjectInputStream.cc | Loading commit data... | |
| natVMObjectStreamClass.cc | Loading commit data... |