From 0f56e0cc566602aa75928d725245bb1410772840 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 26 Aug 2003 14:55:30 +0000 Subject: [PATCH] re PR libgcj/12058 (java.lang.reflect.Array.set(Object, int, Object) throws java.lang.IllegalArgumentException) PR java/12058: * java/lang/reflect/natArray.cc (set): Allow null as argument. From-SVN: r70813 --- libjava/ChangeLog | 3 +++ libjava/java/lang/reflect/natArray.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c1f401d92900..25e337b59ff2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,8 @@ 2003-08-26 Tom Tromey + 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 9fa2ef79d3bc..ce76b9c92d4c 100644 --- 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; } -- 2.47.2