1. 28 Feb, 2004 1 commit
    • 2004-02-28 Guilhem Lavaux <guilhem@kaffe.org> · 646e3290
      	* java/io/ObjectInputStream.java
      	(readClassDescriptor): Keep elements of the mapping non null.
      	(checkTypeConsistency): New method.
      	(readFields): Fixed main loop and base logic. Small reindentation.
      	* java/io/ObjectStreamField.java
      	(lookupField): New method to update the field reference.
      	(checkFieldType): New method.
      	* java/io/ObjectStreamClass.java
      	(setClass, setFields): Call lookupField when building the field
      	database. Check the real field type.
      
      From-SVN: r78627
      Guilhem Lavaux committed
  2. 06 Feb, 2004 1 commit
    • ObjectInputStream.java: Made all calls to dumpElement[ln] conditional on dump flag. · 2941cc06
      2004-02-06  Jeroen Frijters  <jeroen@frijters.net>
      
      	* java/io/ObjectInputStream.java: Made all calls
      	to dumpElement[ln] conditional on dump flag. (readObject): Changed to
      	use cached info from ObjectStreamClass. (readClassDescriptor):
      	Cache more information in ObjectStreamClass. (processResolution,
      	readFields): Use cached info from ObjectStreamClass.
      	(newObject): Throw exception instead of returning null for failure.
      	(getField, getMethod, callReadMethod, setBooleanField, setByteField,
      	setCharField, setDoubleField, setFloatField, setIntField,
      	setLongField, setShortField, setObjectField, readObjectParams):
      	Removed. (dumpElement, dumpElementln): Removed dump flag condition
      	check.
      	* java/io/ObjectStreamField.java (hasReadMethod): Removed.
      	(setClass): Added call to cacheMethods() (findMethod): New method.
      	(cacheMethods): New method. (ObjectStreamClass): Added call to
      	cacheMethods(). (setFields): Cache fields. (getClassUID): Use
      	AccessController.doPrivileged to invoke setAccessible.
      	(readObjectMethod, readResolveMethod, realClassIsSerializable,
      	realClassIsExternalizable, fieldMapping, firstNonSerializableParent):
      	New fields.
      	* java/io/ObjectStreamField.java (ObjectStreamField): New constructor.
      	(ObjectStreamField): Removed FIXME workaround. (getTypeString,
      	isPrimitive): Made safe for cases where type == null.
      	(setBooleanField, setByteField, setCharField, setShortField,
      	setIntField, setLongField, setFloatField, setDoubleField,
      	setObjectField): New methods.
      
      From-SVN: r77395
      Jeroen Frijters committed
  3. 20 Dec, 2003 1 commit
  4. 16 Dec, 2003 1 commit
  5. 20 Jun, 2003 1 commit
  6. 18 Mar, 2003 1 commit
    • BufferedReader.java, [...]: Merged from classpath. · f4f5d1d6
      2003-03-18  Michael Koch  <konqueror@gmx.de>
      
      	* java/io/BufferedReader.java,
      	java/io/BufferedWriter.java,
      	java/io/ByteArrayOutputStream.java,
      	java/io/FileFilter.java,
      	java/io/FilePermission.java,
      	java/io/FileReader.java,
      	java/io/FileWriter.java,
      	java/io/FilenameFilter.java,
      	java/io/FilterInputStream.java,
      	java/io/FilterOutputStream.java,
      	java/io/FilterReader.java,
      	java/io/FilterWriter.java,
      	java/io/ObjectInput.java,
      	java/io/ObjectInputValidation.java,
      	java/io/ObjectOutput.java,
      	java/io/ObjectStreamField.java,
      	java/io/PipedInputStream.java,
      	java/io/PipedReader.java,
      	java/io/PrintWriter.java,
      	java/io/PushbackReader.java,
      	java/io/Reader.java,
      	java/io/SerializablePermission.java,
      	java/io/StringReader.java,
      	java/io/Writer.java:
      	Merged from classpath.
      
      From-SVN: r64525
      Michael Koch committed
  7. 28 Feb, 2003 1 commit
    • Makefile.am (nat_source_files): Remove java/io/natObjectOutputStream.cc. · 4480b3dc
              * 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
      Mark Wielaard committed
  8. 22 Jan, 2002 1 commit
  9. 19 May, 2000 1 commit