re PR libgcj/12058 (java.lang.reflect.Array.set(Object, int, Object) throws java...

	PR java/12058:
	* java/lang/reflect/natArray.cc (set): Allow null as argument.

From-SVN: r70813

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c1f401d9290054a09a8255ed0fcb1a62c76bc7db..25e337b59ff25fc9b3b1d7e6d78a33d515f3af17 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
 2003-08-26  Tom Tromey  <tromey@redhat.com>
 
+       PR java/12058:
+       * java/lang/reflect/natArray.cc (set): Allow null as argument.
+
        * java/lang/reflect/Proxy.java (ProxyData): `pack' now a String.
        (ProxyData.getPackage): New method.
        (ProxyData.getProxyData): Use package name, not Package.

diff --git a/libjava/java/lang/reflect/natArray.cc b/libjava/java/lang/reflect/natArray.cc
index 9fa2ef79d3bc73f6cfdd95a2e71a984ccc451dbd..ce76b9c92d4c7045d1e94f4d94ff4d0318e80a77 100644 (file)
--- a/libjava/java/lang/reflect/natArray.cc
+++ b/libjava/java/lang/reflect/natArray.cc
@@ -364,7 +364,7 @@ java::lang::reflect::Array::set (jobject array, jint index,
 {
   // We don't have to call getElementType here, or check INDEX,
   // because it was already done in the Java wrapper.
-  if (! _Jv_IsInstanceOf (value, elType))
+  if (value != NULL && ! _Jv_IsInstanceOf (value, elType))
     throw new java::lang::IllegalArgumentException;
   elements ((jobjectArray) array) [index] = value;
 }