From 3d22a5ce010f3f8a23751072aa882eb76a1c56c5 Mon Sep 17 00:00:00 2001 From: bryce Date: Tue, 22 Feb 2005 03:13:35 +0000 Subject: 2005-02-21 Bryce McKinlay Merge serialization from GNU Classpath. * gcj/method.h: Add missing #includes. * java/io/ObjectInputStream.java (readClassDescriptor): Check for primitive class IDs on the stream here... (resolveClass): ...not here. * java/io/ObjectStreamField.java: Use VMObjectStream class calls to set fields. * java/io/VMObjectStreamClass.java (setDoubleNative, setFloatNative, setLongNative, setIntNative, setShortNative, setCharNative, setByteNative, setBooleanNative, setObjectNative): New native methods. * java/io/natVMObjectStreamClass.java (setDoubleNative, setFloatNative, setLongNative, setIntNative, setShortNative, setCharNative, setByteNative, setBooleanNative, setObjectNative): Implement them. * java/io/natObjectInputStream.cc (allocateObject): Add new parameters from Classpath's version. Use _Jv_FromReflectedConstructor(). Call the constructor here. (callConstructor): Removed. (getCallersClassLoader): Removed. * java/lang/reflect/Field.java (setByte, setShort, setInt, setLong, setFloat, setDouble, setChar, setBoolean): Add 'checkFinal' parameter to control whether setting final field values is permitted. Call getAddr() with checkFinal parameter instead of setAddr(). * java/lang/reflect/natField.cc (getType): Lookup and resolve field only if not done already. (getAddr): Add checkFinal parameter. Do the final field check only if checkFinal is set. (setAddr): Removed. 2005-02-21 Mark Wielaard # Fixes bug #11957 * java/io/ObjectInputStream.java (resolveClass): Don't check "void" twice. 2005-02-21 Mark Wielaard Fixes bug #11618. * java/io/ObjectInputStream.java (readClassDescriptor): Handle classes without a super class and us ObjectStreamClass.lookupForClassObject(). (resolveClass): Check for primitive types. (lookupClass): Return null when argument is null. 2005-02-21 Jeroen Frijters * java/io/ObjectInputStream.java (readObject): Fix to consume TC_ENDBLOCKDATA after readExternal. 2005-02-21 Jeroen Frijters * java/io/ObjectOutputStream.java (writeObject, callWriteMethod): Replaced reflection with accessing cached info in ObjectStreamClass. (getMethod): Removed. * java/io/ObjectStreamClass.java (findMethod): Added check to make sure the method found has the right modifiers. (cacheMethods): Added writeReplace and writeObject methods. (setFlags): Look at new writeObjectMethod field instead of doing reflection again. (writeReplaceMethod): New field. (writeObjectMethod): New field. 2005-02-21 Guilhem Lavaux Jeroen Frijters * java/io/ObjectInputStream.java (newObject): Changed prototype. Get a constructor reflect object directly. (callConstructor): Removed. (allocateObject): Changed prototype. (readClassDescriptor): Build the constructor reflection directly. (readObject): Invoke newObject using the new prototype. * java/io/ObjectStreamClass.java (firstNonSerializableParent): Removed. (firstNonSerializableParentConstructor): Added. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95378 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/io/ObjectStreamField.java | 81 ++++------------------------------ 1 file changed, 9 insertions(+), 72 deletions(-) (limited to 'libjava/java/io/ObjectStreamField.java') diff --git a/libjava/java/io/ObjectStreamField.java b/libjava/java/io/ObjectStreamField.java index 93a121cd762..8c1a5db7b59 100644 --- a/libjava/java/io/ObjectStreamField.java +++ b/libjava/java/io/ObjectStreamField.java @@ -367,109 +367,46 @@ public class ObjectStreamField implements Comparable final void setBooleanField(Object obj, boolean val) { - try - { - field.setBoolean(obj, val); - } - catch(IllegalAccessException x) - { - throw new InternalError(x.getMessage()); - } + VMObjectStreamClass.setBooleanNative(field, obj, val); } final void setByteField(Object obj, byte val) { - try - { - field.setByte(obj, val); - } - catch(IllegalAccessException x) - { - throw new InternalError(x.getMessage()); - } + VMObjectStreamClass.setByteNative(field, obj, val); } final void setCharField(Object obj, char val) { - try - { - field.setChar(obj, val); - } - catch(IllegalAccessException x) - { - throw new InternalError(x.getMessage()); - } + VMObjectStreamClass.setCharNative(field, obj, val); } final void setShortField(Object obj, short val) { - try - { - field.setShort(obj, val); - } - catch(IllegalAccessException x) - { - throw new InternalError(x.getMessage()); - } + VMObjectStreamClass.setShortNative(field, obj, val); } final void setIntField(Object obj, int val) { - try - { - field.setInt(obj, val); - } - catch(IllegalAccessException x) - { - throw new InternalError(x.getMessage()); - } + VMObjectStreamClass.setIntNative(field, obj, val); } final void setLongField(Object obj, long val) { - try - { - field.setLong(obj, val); - } - catch(IllegalAccessException x) - { - throw new InternalError(x.getMessage()); - } + VMObjectStreamClass.setLongNative(field, obj, val); } final void setFloatField(Object obj, float val) { - try - { - field.setFloat(obj, val); - } - catch(IllegalAccessException x) - { - throw new InternalError(x.getMessage()); - } + VMObjectStreamClass.setFloatNative(field, obj, val); } final void setDoubleField(Object obj, double val) { - try - { - field.setDouble(obj, val); - } - catch(IllegalAccessException x) - { - throw new InternalError(x.getMessage()); - } + VMObjectStreamClass.setDoubleNative(field, obj, val); } final void setObjectField(Object obj, Object val) { - try - { - field.set(obj, val); - } - catch(IllegalAccessException x) - { - throw new InternalError(x.getMessage()); - } + VMObjectStreamClass.setObjectNative(field, obj, val); } } -- cgit v1.2.3