2003-01-20 07:46:28 +01:00
|
|
|
/* VMObjectStreamClass.java -- VM helper functions for ObjectStreamClass
|
|
|
|
Copyright (C) 2003 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
2005-06-30 05:22:09 +02:00
|
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
|
|
02110-1301 USA.
|
2003-01-20 07:46:28 +01:00
|
|
|
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
|
|
making a combined work based on this library. Thus, the terms and
|
|
|
|
conditions of the GNU General Public License cover the whole
|
|
|
|
combination.
|
|
|
|
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
|
|
permission to link this library with independent modules to produce an
|
|
|
|
executable, regardless of the license terms of these independent
|
|
|
|
modules, and to copy and distribute the resulting executable under
|
|
|
|
terms of your choice, provided that you also meet, for each linked
|
|
|
|
independent module, the terms and conditions of the license of that
|
|
|
|
module. An independent module is a module which is not derived from
|
|
|
|
or based on this library. If you modify this library, you may extend
|
|
|
|
this exception to your version of the library, but you are not
|
|
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
|
|
exception statement from your version. */
|
|
|
|
|
|
|
|
|
|
|
|
package java.io;
|
|
|
|
|
[multiple changes]
2005-02-21 Bryce McKinlay <mckinlay@redhat.com>
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 <mark@klomp.org>
# Fixes bug #11957
* java/io/ObjectInputStream.java (resolveClass): Don't check "void"
twice.
2005-02-21 Mark Wielaard <mark@klomp.org>
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 <jeroen@frijters.net>
* java/io/ObjectInputStream.java
(readObject): Fix to consume TC_ENDBLOCKDATA after readExternal.
2005-02-21 Jeroen Frijters <jeroen@frijters.net>
* 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 <guilhem@kaffe.org>
Jeroen Frijters <jeroen@frijters.net>
* 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.
From-SVN: r95378
2005-02-22 04:13:35 +01:00
|
|
|
import java.lang.reflect.Field;
|
2003-01-20 07:46:28 +01:00
|
|
|
|
|
|
|
final class VMObjectStreamClass
|
|
|
|
{
|
|
|
|
/**
|
|
|
|
* Returns true if CLAZZ has a static class initializer
|
|
|
|
* (a.k.a. <clinit>).
|
|
|
|
*/
|
|
|
|
static native boolean hasClassInitializer (Class clazz);
|
[multiple changes]
2005-02-21 Bryce McKinlay <mckinlay@redhat.com>
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 <mark@klomp.org>
# Fixes bug #11957
* java/io/ObjectInputStream.java (resolveClass): Don't check "void"
twice.
2005-02-21 Mark Wielaard <mark@klomp.org>
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 <jeroen@frijters.net>
* java/io/ObjectInputStream.java
(readObject): Fix to consume TC_ENDBLOCKDATA after readExternal.
2005-02-21 Jeroen Frijters <jeroen@frijters.net>
* 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 <guilhem@kaffe.org>
Jeroen Frijters <jeroen@frijters.net>
* 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.
From-SVN: r95378
2005-02-22 04:13:35 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the value of the specified "double" field, allowing final values
|
|
|
|
* to be assigned.
|
|
|
|
*
|
|
|
|
* @param field Field to set the value.
|
|
|
|
* @param obj Instance which will have its field set.
|
|
|
|
* @param val Value to put in the field.
|
|
|
|
*/
|
|
|
|
static native void setDoubleNative(Field field, Object obj, double val);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the value of the specified "float" field, allowing final values
|
|
|
|
* to be assigned.
|
|
|
|
*
|
|
|
|
* @param field Field to set the value.
|
|
|
|
* @param obj Instance which will have its field set.
|
|
|
|
* @param val Value to put in the field.
|
|
|
|
*/
|
|
|
|
static native void setFloatNative(Field field, Object obj, float val);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the value of the specified "long" field, allowing final values
|
|
|
|
* to be assigned.
|
|
|
|
*
|
|
|
|
* @param field Field to set the value.
|
|
|
|
* @param obj Instance which will have its field set.
|
|
|
|
* @param val Value to put in the field.
|
|
|
|
*/
|
|
|
|
static native void setLongNative(Field field, Object obj, long val);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the value of the specified "int" field, allowing final values
|
|
|
|
* to be assigned.
|
|
|
|
*
|
|
|
|
* @param field Field to set the value.
|
|
|
|
* @param obj Instance which will have its field set.
|
|
|
|
* @param val Value to put in the field.
|
|
|
|
*/
|
|
|
|
static native void setIntNative(Field field, Object obj, int val);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the value of the specified "short" field, allowing final values
|
|
|
|
* to be assigned.
|
|
|
|
*
|
|
|
|
* @param field Field to set the value.
|
|
|
|
* @param obj Instance which will have its field set.
|
|
|
|
* @param val Value to put in the field.
|
|
|
|
*/
|
|
|
|
static native void setShortNative(Field field, Object obj, short val);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the value of the specified "char" field, allowing final values
|
|
|
|
* to be assigned.
|
|
|
|
*
|
|
|
|
* @param field Field to set the value.
|
|
|
|
* @param obj Instance which will have its field set.
|
|
|
|
* @param val Value to put in the field.
|
|
|
|
*/
|
|
|
|
static native void setCharNative(Field field, Object obj, char val);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the value of the specified "byte" field, allowing final values
|
|
|
|
* to be assigned.
|
|
|
|
*
|
|
|
|
* @param field Field to set the value.
|
|
|
|
* @param obj Instance which will have its field set.
|
|
|
|
* @param val Value to put in the field.
|
|
|
|
*/
|
|
|
|
static native void setByteNative(Field field, Object obj, byte val);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the value of the specified "boolean" field, allowing final values
|
|
|
|
* to be assigned.
|
|
|
|
*
|
|
|
|
* @param field Field to set the value.
|
|
|
|
* @param obj Instance which will have its field set.
|
|
|
|
* @param val Value to put in the field.
|
|
|
|
*/
|
|
|
|
static native void setBooleanNative(Field field, Object obj, boolean val);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the value of the specified object field, allowing final values
|
|
|
|
* to be assigned.
|
|
|
|
*
|
|
|
|
* @param field Field to set the value.
|
|
|
|
* @param obj Instance which will have its field set.
|
|
|
|
* @param val Value to put in the field.
|
|
|
|
*/
|
|
|
|
static native void setObjectNative(Field field, Object obj, Object val);
|
2003-01-20 07:46:28 +01:00
|
|
|
}
|