re PR libgcj/4208 (Problem using 'null' with Java reflection)

	* java/lang/reflect/natField.cc (set): Allow for case when the
	value is null.  Fixes PR libgcj/4208.

From-SVN: r45367

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4c70701a62e25d1f5eaaf5fa27ac45eeb5c1b943..aba2dd3d8ee27783a54c86d51cca2ccd0015d445 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,7 +1,7 @@
-2001-09-02  Tom Tromey  <tromey@redhat.com>
+2001-09-03  Tom Tromey  <tromey@redhat.com>
 
-       * java/security/spec/AlgorithmParameterSpec.java,
-       java/security/spec/KeySpec.java: Re-merged with Classpath.
+       * java/lang/reflect/natField.cc (set): Allow for case when the
+       value is null.  Fixes PR libgcj/4208.
 
        * gcj/javaprims.h: Regenerated class list.
        * java/lang/IllegalThreadStateException.java,

diff --git a/libjava/java/lang/reflect/natField.cc b/libjava/java/lang/reflect/natField.cc
index b627485b58bb7daffe1da0fa46139b945785a3bf..3ca9293a816660db5554f9e90042954d709f2c79 100644 (file)
--- a/libjava/java/lang/reflect/natField.cc
+++ b/libjava/java/lang/reflect/natField.cc
@@ -418,9 +418,10 @@ java::lang::reflect::Field::setDouble (jclass caller, jobject obj, jdouble d)
 }
 
 void
-java::lang::reflect::Field::set (jclass caller, jobject object, jobject value, jclass type)
+java::lang::reflect::Field::set (jclass caller, jobject object, jobject value,
+                                jclass type)
 {
-  if (! _Jv_IsInstanceOf (value, type))
+  if (value != NULL && ! _Jv_IsInstanceOf (value, type))
     throw new java::lang::IllegalArgumentException;
   void* addr = getAddr (this, caller, object);
   * (jobject*) addr = value;