From: Tom Tromey <tromey@cygnus.com>
Date: Wed, 6 Sep 2000 21:20:45 +0000 (+0000)
Subject: natMethod.cc (_Jv_CallAnyMethodA): Accept null `args' if method takes no parameters.
X-Git-Tag: prereleases/libstdc++-2.92~4214
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcf98e48ef4b9eeee82ca6505153216d4b55a22b;p=thirdparty%2Fgcc.git

natMethod.cc (_Jv_CallAnyMethodA): Accept null `args' if method takes no parameters.

	* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Accept null
	`args' if method takes no parameters.

From-SVN: r36209
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1c0cbcdc055e..7af3054ef3dc 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-06  Tom Tromey  <tromey@cygnus.com>
 
+	* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Accept null
+	`args' if method takes no parameters.
+
 	Fix for PR java.lang/339:
 	* java/lang/natPosixProcess.cc (fail): New function.
 	(cleanup): New function.
diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc
index ef6ab53056db..897285261da1 100644
--- a/libjava/java/lang/reflect/natMethod.cc
+++ b/libjava/java/lang/reflect/natMethod.cc
@@ -447,13 +447,17 @@ _Jv_CallAnyMethodA (jobject obj,
 {
   // FIXME: access checks.
 
-  if (parameter_types->length != args->length)
+  if (parameter_types->length == 0 && args == NULL)
+    {
+      // The JDK accepts this, so we do too.
+    }
+  else if (parameter_types->length != args->length)
     JvThrow (new java::lang::IllegalArgumentException);
 
   int param_count = parameter_types->length;
 
   jclass *paramelts = elements (parameter_types);
-  jobject *argelts = elements (args);
+  jobject *argelts = args == NULL ? NULL : elements (args);
   jvalue argvals[param_count];
 
 #define COPY(Where, What, Type) \