From 415c055a2acc0449e4c20fe22e703d7173de2629 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Tue, 30 Oct 2001 10:14:48 +0000 Subject: [PATCH] jni.cc (JNI_CreateJavaVM): Call _Jv_CreateJavaVM. * jni.cc (JNI_CreateJavaVM): Call _Jv_CreateJavaVM. Don't call _Jv_JNI_Init. From-SVN: r46633 --- libjava/ChangeLog | 5 +++++ libjava/jni.cc | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f271a8ffd17..8abc16751c6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2001-10-30 Bryce McKinlay + + * jni.cc (JNI_CreateJavaVM): Call _Jv_CreateJavaVM. Don't call + _Jv_JNI_Init. + 2001-10-29 Tom Tromey * java/util/zip/GZIPOutputStream.java (write(int)): New method. diff --git a/libjava/jni.cc b/libjava/jni.cc index 8e586fa38f1..0348d1de620 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -2108,6 +2108,9 @@ jint JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args) { JvAssert (! the_vm); + + _Jv_CreateJavaVM (NULL); + // FIXME: synchronize JavaVM *nvm = (JavaVM *) _Jv_MallocUnchecked (sizeof (JavaVM)); if (nvm == NULL) @@ -2163,8 +2166,6 @@ JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args) the_vm = nvm; *vm = the_vm; - _Jv_JNI_Init(); - return 0; } -- 2.30.2