Commit 415c055a by Bryce McKinlay Committed by Bryce McKinlay

jni.cc (JNI_CreateJavaVM): Call _Jv_CreateJavaVM.

        * jni.cc (JNI_CreateJavaVM): Call _Jv_CreateJavaVM. Don't call
        _Jv_JNI_Init.

From-SVN: r46633
parent 4fe8523b
2001-10-30 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* jni.cc (JNI_CreateJavaVM): Call _Jv_CreateJavaVM. Don't call
_Jv_JNI_Init.
2001-10-29 Tom Tromey <tromey@redhat.com> 2001-10-29 Tom Tromey <tromey@redhat.com>
* java/util/zip/GZIPOutputStream.java (write(int)): New method. * java/util/zip/GZIPOutputStream.java (write(int)): New method.
......
...@@ -2108,6 +2108,9 @@ jint ...@@ -2108,6 +2108,9 @@ jint
JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args) JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args)
{ {
JvAssert (! the_vm); JvAssert (! the_vm);
_Jv_CreateJavaVM (NULL);
// FIXME: synchronize // FIXME: synchronize
JavaVM *nvm = (JavaVM *) _Jv_MallocUnchecked (sizeof (JavaVM)); JavaVM *nvm = (JavaVM *) _Jv_MallocUnchecked (sizeof (JavaVM));
if (nvm == NULL) if (nvm == NULL)
...@@ -2163,8 +2166,6 @@ JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args) ...@@ -2163,8 +2166,6 @@ JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args)
the_vm = nvm; the_vm = nvm;
*vm = the_vm; *vm = the_vm;
_Jv_JNI_Init();
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment