[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
This commit is contained in:
Bryce McKinlay
@@ -23,6 +23,9 @@ public final class Field extends AccessibleObject implements Member
|
||||
// Offset in bytes from the start of declaringClass's fields array.
|
||||
private int offset;
|
||||
|
||||
// The Class (or primitive TYPE) of this field.
|
||||
private Class type;
|
||||
|
||||
// This is instantiated by Class sometimes, but it uses C++ and
|
||||
// avoids the Java protection check.
|
||||
Field ()
|
||||
@@ -136,76 +139,79 @@ public final class Field extends AccessibleObject implements Member
|
||||
public void setByte (Object obj, byte b)
|
||||
throws IllegalArgumentException, IllegalAccessException
|
||||
{
|
||||
setByte(null, obj, b);
|
||||
setByte(null, obj, b, true);
|
||||
}
|
||||
|
||||
public void setShort (Object obj, short s)
|
||||
throws IllegalArgumentException, IllegalAccessException
|
||||
{
|
||||
setShort(null, obj, s);
|
||||
setShort(null, obj, s, true);
|
||||
}
|
||||
|
||||
public void setInt (Object obj, int i)
|
||||
throws IllegalArgumentException, IllegalAccessException
|
||||
{
|
||||
setInt(null, obj, i);
|
||||
setInt(null, obj, i, true);
|
||||
}
|
||||
|
||||
public void setLong (Object obj, long l)
|
||||
throws IllegalArgumentException, IllegalAccessException
|
||||
{
|
||||
setLong(null, obj, l);
|
||||
setLong(null, obj, l, true);
|
||||
}
|
||||
|
||||
public void setFloat (Object obj, float f)
|
||||
throws IllegalArgumentException, IllegalAccessException
|
||||
{
|
||||
setFloat(null, obj, f);
|
||||
setFloat(null, obj, f, true);
|
||||
}
|
||||
|
||||
public void setDouble (Object obj, double d)
|
||||
throws IllegalArgumentException, IllegalAccessException
|
||||
{
|
||||
setDouble(null, obj, d);
|
||||
setDouble(null, obj, d, true);
|
||||
}
|
||||
|
||||
public void setChar (Object obj, char c)
|
||||
throws IllegalArgumentException, IllegalAccessException
|
||||
{
|
||||
setChar(null, obj, c);
|
||||
setChar(null, obj, c, true);
|
||||
}
|
||||
|
||||
public void setBoolean (Object obj, boolean b)
|
||||
throws IllegalArgumentException, IllegalAccessException
|
||||
{
|
||||
setBoolean(null, obj, b);
|
||||
setBoolean(null, obj, b, true);
|
||||
}
|
||||
|
||||
private native void setByte (Class caller, Object obj, byte b)
|
||||
native void setByte (Class caller, Object obj, byte b, boolean checkFinal)
|
||||
throws IllegalArgumentException, IllegalAccessException;
|
||||
|
||||
private native void setShort (Class caller, Object obj, short s)
|
||||
native void setShort (Class caller, Object obj, short s, boolean checkFinal)
|
||||
throws IllegalArgumentException, IllegalAccessException;
|
||||
|
||||
private native void setInt (Class caller, Object obj, int i)
|
||||
native void setInt (Class caller, Object obj, int i, boolean checkFinal)
|
||||
throws IllegalArgumentException, IllegalAccessException;
|
||||
|
||||
private native void setLong (Class caller, Object obj, long l)
|
||||
native void setLong (Class caller, Object obj, long l, boolean checkFinal)
|
||||
throws IllegalArgumentException, IllegalAccessException;
|
||||
|
||||
private native void setFloat (Class caller, Object obj, float f)
|
||||
native void setFloat (Class caller, Object obj, float f, boolean checkFinal)
|
||||
throws IllegalArgumentException, IllegalAccessException;
|
||||
|
||||
private native void setDouble (Class caller, Object obj, double d)
|
||||
native void setDouble (Class caller, Object obj, double d,
|
||||
boolean checkFinal)
|
||||
throws IllegalArgumentException, IllegalAccessException;
|
||||
|
||||
private native void setChar (Class caller, Object obj, char c)
|
||||
native void setChar (Class caller, Object obj, char c, boolean checkFinal)
|
||||
throws IllegalArgumentException, IllegalAccessException;
|
||||
|
||||
private native void setBoolean (Class caller, Object obj, boolean b)
|
||||
native void setBoolean (Class caller, Object obj, boolean b,
|
||||
boolean checkFinal)
|
||||
throws IllegalArgumentException, IllegalAccessException;
|
||||
|
||||
private native void set (Class caller, Object obj, Object val, Class type)
|
||||
native void set (Class caller, Object obj, Object val, Class type,
|
||||
boolean checkFinal)
|
||||
throws IllegalArgumentException, IllegalAccessException;
|
||||
|
||||
public void set (Object object, Object value)
|
||||
@@ -219,23 +225,23 @@ public final class Field extends AccessibleObject implements Member
|
||||
{
|
||||
Class type = getType();
|
||||
if (! type.isPrimitive())
|
||||
set(caller, object, value, type);
|
||||
set(caller, object, value, type, true);
|
||||
else if (value instanceof Byte)
|
||||
setByte(caller, object, ((Byte) value).byteValue());
|
||||
setByte(caller, object, ((Byte) value).byteValue(), true);
|
||||
else if (value instanceof Short)
|
||||
setShort (caller, object, ((Short) value).shortValue());
|
||||
setShort (caller, object, ((Short) value).shortValue(), true);
|
||||
else if (value instanceof Integer)
|
||||
setInt(caller, object, ((Integer) value).intValue());
|
||||
setInt(caller, object, ((Integer) value).intValue(), true);
|
||||
else if (value instanceof Long)
|
||||
setLong(caller, object, ((Long) value).longValue());
|
||||
setLong(caller, object, ((Long) value).longValue(), true);
|
||||
else if (value instanceof Float)
|
||||
setFloat(caller, object, ((Float) value).floatValue());
|
||||
setFloat(caller, object, ((Float) value).floatValue(), true);
|
||||
else if (value instanceof Double)
|
||||
setDouble(caller, object, ((Double) value).doubleValue());
|
||||
setDouble(caller, object, ((Double) value).doubleValue(), true);
|
||||
else if (value instanceof Character)
|
||||
setChar(caller, object, ((Character) value).charValue());
|
||||
setChar(caller, object, ((Character) value).charValue(), true);
|
||||
else if (value instanceof Boolean)
|
||||
setBoolean(caller, object, ((Boolean) value).booleanValue());
|
||||
setBoolean(caller, object, ((Boolean) value).booleanValue(), true);
|
||||
else
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
|
||||
@@ -45,14 +45,19 @@ java::lang::reflect::Field::getName ()
|
||||
jclass
|
||||
java::lang::reflect::Field::getType ()
|
||||
{
|
||||
jfieldID fld = _Jv_FromReflectedField (this);
|
||||
JvSynchronize sync (declaringClass);
|
||||
_Jv_Linker::resolve_field (fld, declaringClass->getClassLoaderInternal ());
|
||||
return fld->type;
|
||||
if (type == NULL)
|
||||
{
|
||||
jfieldID fld = _Jv_FromReflectedField (this);
|
||||
JvSynchronize sync (declaringClass);
|
||||
_Jv_Linker::resolve_field (fld, declaringClass->getClassLoaderInternal ());
|
||||
type = fld->type;
|
||||
}
|
||||
return type;
|
||||
}
|
||||
|
||||
static void*
|
||||
getAddr (java::lang::reflect::Field* field, jclass caller, jobject obj)
|
||||
getAddr (java::lang::reflect::Field* field, jclass caller, jobject obj,
|
||||
jboolean checkFinal)
|
||||
{
|
||||
// FIXME: we know CALLER is NULL here. At one point we planned to
|
||||
// have the compiler insert the caller as a hidden argument in some
|
||||
@@ -63,6 +68,12 @@ getAddr (java::lang::reflect::Field* field, jclass caller, jobject obj)
|
||||
|
||||
jfieldID fld = _Jv_FromReflectedField (field);
|
||||
_Jv_ushort flags = fld->getModifiers();
|
||||
|
||||
// Setting a final field is usually not allowed.
|
||||
if (checkFinal
|
||||
&& field->getModifiers() & java::lang::reflect::Modifier::FINAL)
|
||||
throw new java::lang::IllegalAccessException(JvNewStringUTF
|
||||
("Field is final"));
|
||||
|
||||
// Check accessibility, if required.
|
||||
if (! (Modifier::isPublic (flags) || field->isAccessible()))
|
||||
@@ -180,56 +191,56 @@ getDouble (jclass cls, void* addr)
|
||||
jboolean
|
||||
java::lang::reflect::Field::getBoolean (jclass caller, jobject obj)
|
||||
{
|
||||
return ::getBoolean (this->getType(), getAddr (this, caller, obj));
|
||||
return ::getBoolean (this->getType(), getAddr (this, caller, obj, false));
|
||||
}
|
||||
|
||||
jchar
|
||||
java::lang::reflect::Field::getChar (jclass caller, jobject obj)
|
||||
{
|
||||
return ::getChar (this->getType(), getAddr (this, caller, obj));
|
||||
return ::getChar (this->getType(), getAddr (this, caller, obj, false));
|
||||
}
|
||||
|
||||
jbyte
|
||||
java::lang::reflect::Field::getByte (jclass caller, jobject obj)
|
||||
{
|
||||
return ::getByte (this->getType(), getAddr (this, caller, obj));
|
||||
return ::getByte (this->getType(), getAddr (this, caller, obj, false));
|
||||
}
|
||||
|
||||
jshort
|
||||
java::lang::reflect::Field::getShort (jclass caller, jobject obj)
|
||||
{
|
||||
return ::getShort (this->getType(), getAddr (this, caller, obj));
|
||||
return ::getShort (this->getType(), getAddr (this, caller, obj, false));
|
||||
}
|
||||
|
||||
jint
|
||||
java::lang::reflect::Field::getInt (jclass caller, jobject obj)
|
||||
{
|
||||
return ::getInt (this->getType(), getAddr (this, caller, obj));
|
||||
return ::getInt (this->getType(), getAddr (this, caller, obj, false));
|
||||
}
|
||||
|
||||
jlong
|
||||
java::lang::reflect::Field::getLong (jclass caller, jobject obj)
|
||||
{
|
||||
return ::getLong (this->getType(), getAddr (this, caller, obj));
|
||||
return ::getLong (this->getType(), getAddr (this, caller, obj, false));
|
||||
}
|
||||
|
||||
jfloat
|
||||
java::lang::reflect::Field::getFloat (jclass caller, jobject obj)
|
||||
{
|
||||
return ::getFloat (this->getType(), getAddr (this, caller, obj));
|
||||
return ::getFloat (this->getType(), getAddr (this, caller, obj, false));
|
||||
}
|
||||
|
||||
jdouble
|
||||
java::lang::reflect::Field::getDouble (jclass caller, jobject obj)
|
||||
{
|
||||
return ::getDouble (this->getType(), getAddr (this, caller, obj));
|
||||
return ::getDouble (this->getType(), getAddr (this, caller, obj, false));
|
||||
}
|
||||
|
||||
jobject
|
||||
java::lang::reflect::Field::get (jclass caller, jobject obj)
|
||||
{
|
||||
jclass type = this->getType();
|
||||
void* addr = getAddr (this, caller, obj);
|
||||
void* addr = getAddr (this, caller, obj, false);
|
||||
if (! type->isPrimitive ())
|
||||
return * (jobject*) addr;
|
||||
if (type == JvPrimClass (double))
|
||||
@@ -257,16 +268,6 @@ java::lang::reflect::Field::get (jclass caller, jobject obj)
|
||||
throw new java::lang::IllegalArgumentException;
|
||||
}
|
||||
|
||||
static void*
|
||||
setAddr (java::lang::reflect::Field* field, jclass caller, jobject obj)
|
||||
{
|
||||
void *addr = getAddr(field, caller, obj);
|
||||
if (!field->isAccessible()
|
||||
&& field->getModifiers() & java::lang::reflect::Modifier::FINAL)
|
||||
throw new java::lang::IllegalAccessException();
|
||||
return addr;
|
||||
}
|
||||
|
||||
static void
|
||||
setBoolean (jclass type, void *addr, jboolean value)
|
||||
{
|
||||
@@ -378,57 +379,66 @@ setDouble (jclass type, void *addr, jdouble value)
|
||||
}
|
||||
|
||||
void
|
||||
java::lang::reflect::Field::setBoolean (jclass caller, jobject obj, jboolean b)
|
||||
java::lang::reflect::Field::setBoolean (jclass caller, jobject obj, jboolean b,
|
||||
jboolean checkFinal)
|
||||
{
|
||||
::setBoolean (this->getType(), setAddr (this, caller, obj), b);
|
||||
::setBoolean (this->getType(), getAddr (this, caller, obj, checkFinal), b);
|
||||
}
|
||||
|
||||
void
|
||||
java::lang::reflect::Field::setChar (jclass caller, jobject obj, jchar c)
|
||||
java::lang::reflect::Field::setChar (jclass caller, jobject obj, jchar c,
|
||||
jboolean checkFinal)
|
||||
{
|
||||
::setChar (this->getType(), setAddr (this, caller, obj), c);
|
||||
::setChar (this->getType(), getAddr (this, caller, obj, checkFinal), c);
|
||||
}
|
||||
|
||||
void
|
||||
java::lang::reflect::Field::setByte (jclass caller, jobject obj, jbyte b)
|
||||
java::lang::reflect::Field::setByte (jclass caller, jobject obj, jbyte b,
|
||||
jboolean checkFinal)
|
||||
{
|
||||
::setByte (this->getType(), setAddr (this, caller, obj), b);
|
||||
::setByte (this->getType(), getAddr (this, caller, obj, checkFinal), b);
|
||||
}
|
||||
|
||||
void
|
||||
java::lang::reflect::Field::setShort (jclass caller, jobject obj, jshort s)
|
||||
java::lang::reflect::Field::setShort (jclass caller, jobject obj, jshort s,
|
||||
jboolean checkFinal)
|
||||
{
|
||||
::setShort (this->getType(), setAddr (this, caller, obj), s);
|
||||
::setShort (this->getType(), getAddr (this, caller, obj, checkFinal), s);
|
||||
}
|
||||
|
||||
void
|
||||
java::lang::reflect::Field::setInt (jclass caller, jobject obj, jint i)
|
||||
java::lang::reflect::Field::setInt (jclass caller, jobject obj, jint i,
|
||||
jboolean checkFinal)
|
||||
{
|
||||
::setInt (this->getType(), setAddr (this, caller, obj), i);
|
||||
::setInt (this->getType(), getAddr (this, caller, obj, checkFinal), i);
|
||||
}
|
||||
|
||||
void
|
||||
java::lang::reflect::Field::setLong (jclass caller, jobject obj, jlong l)
|
||||
java::lang::reflect::Field::setLong (jclass caller, jobject obj, jlong l,
|
||||
jboolean checkFinal)
|
||||
{
|
||||
::setLong (this->getType(), setAddr (this, caller, obj), l);
|
||||
}
|
||||
void
|
||||
java::lang::reflect::Field::setFloat (jclass caller, jobject obj, jfloat f)
|
||||
{
|
||||
::setFloat (this->getType(), setAddr (this, caller, obj), f);
|
||||
::setLong (this->getType(), getAddr (this, caller, obj, checkFinal), l);
|
||||
}
|
||||
|
||||
void
|
||||
java::lang::reflect::Field::setDouble (jclass caller, jobject obj, jdouble d)
|
||||
java::lang::reflect::Field::setFloat (jclass caller, jobject obj, jfloat f,
|
||||
jboolean checkFinal)
|
||||
{
|
||||
::setDouble (this->getType(), setAddr (this, caller, obj), d);
|
||||
::setFloat (this->getType(), getAddr (this, caller, obj, checkFinal), f);
|
||||
}
|
||||
|
||||
void
|
||||
java::lang::reflect::Field::setDouble (jclass caller, jobject obj, jdouble d,
|
||||
jboolean checkFinal)
|
||||
{
|
||||
::setDouble (this->getType(), getAddr (this, caller, obj, checkFinal), d);
|
||||
}
|
||||
|
||||
void
|
||||
java::lang::reflect::Field::set (jclass caller, jobject object, jobject value,
|
||||
jclass type)
|
||||
jclass type, jboolean checkFinal)
|
||||
{
|
||||
void* addr = setAddr (this, caller, object);
|
||||
void* addr = getAddr (this, caller, object, checkFinal);
|
||||
if (value != NULL && ! _Jv_IsInstanceOf (value, type))
|
||||
throw new java::lang::IllegalArgumentException;
|
||||
* (jobject*) addr = value;
|
||||
|
||||
Reference in New Issue
Block a user