aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog3
-rw-r--r--libjava/java/lang/reflect/natArray.cc2
2 files changed, 4 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c1f401d..25e337b 100644
--- 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 9fa2ef7..ce76b9c 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;
}