OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jni.cc (mangled_name): Fixed assertion.

Browse Source 
* jni.cc (mangled_name): Fixed assertion.
	(JNI_GetCreatedJavaVMs): Don't comment out `buf_len' argument;
	turned assert into actual failure.

From-SVN: r32546
This commit is contained in:
Tom Tromey 2000-03-14 21:59:54 +00:00 committed by Tom Tromey
parent 0edd203b8d
commit 90a883ae6b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2000-03-14 Tom Tromey <tromey@cygnus.com>
* jni.cc (mangled_name): Fixed assertion.
(JNI_GetCreatedJavaVMs): Don't comment out `buf_len' argument;
turned assert into actual failure.
2000-03-09 Warren Levy <warrenl@cygnus.com> 2000-03-09 Warren Levy <warrenl@cygnus.com>
* java/security/Key.java(serialVersionUID): Set to 0 for now. * java/security/Key.java(serialVersionUID): Set to 0 for now.

8
libjava/jni.cc
View File

@ -1606,7 +1606,7 @@ mangled_name (jclass klass, _Jv_Utf8Const *func_name,
const unsigned char *sig = (const unsigned char *) signature->data; const unsigned char *sig = (const unsigned char *) signature->data;
limit = sig + signature->length; limit = sig + signature->length;
JvAssert (signature[0] == '('); JvAssert (sig[0] == '(');
++sig; ++sig;
while (1) while (1)
{ {
@ -1958,9 +1958,11 @@ JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args)
} }
jint jint
JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize /* buf_len */, jsize *n_vms) JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize buf_len, jsize *n_vms)
{ {
JvAssert (buf_len > 0); if (buf_len <= 0)
return JNI_ERR;
// We only support a single VM. // We only support a single VM.
if (the_vm != NULL) if (the_vm != NULL)
{ {