jni.cc (JNI_CreateJavaVM): Call _Jv_CreateJavaVM.

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

From-SVN: r46633

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f271a8ffd17f6fb7a061995cc2f2e2772a3f81d0..8abc16751c6dff13e3b426f5b4223d7f42027482 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
        * java/util/zip/GZIPOutputStream.java (write(int)): New method.

diff --git a/libjava/jni.cc b/libjava/jni.cc
index 8e586fa38f1a3039fecebb9220a157e1ef563283..0348d1de620d022f0fe3b5e551e54674290f1cfb 100644 (file)
--- 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;
 }