diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-06 21:20:45 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-09-06 21:20:45 +0000 |
| commit | 8082f11d5b2c0c7db1a87f5ab910b2be64f99c2f (patch) | |
| tree | 780c248203856cfbb39819bd9a522607d31007b3 | |
| parent | 94ae07baf0dd1c9e78fbc4b24fedbbb864d5aee9 (diff) | |
| download | ppe42-gcc-8082f11d5b2c0c7db1a87f5ab910b2be64f99c2f.tar.gz ppe42-gcc-8082f11d5b2c0c7db1a87f5ab910b2be64f99c2f.zip | |
* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Accept null
`args' if method takes no parameters.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36209 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 3 | ||||
| -rw-r--r-- | libjava/java/lang/reflect/natMethod.cc | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1c0cbcdc055..7af3054ef3d 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 ef6ab53056d..897285261da 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) \ |
