* jni.cc (_Jv_GetJNIEnvNewFrame): Set env->ex in all cases.

From-SVN: r58971

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 33e0742d334ac58e3858d838f2afbd28f777ace6..3024eb0f3aa7221a77559667b05b0b09d4f675d5 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-10  Tom Tromey  <tromey@redhat.com>
+
+       * jni.cc (_Jv_GetJNIEnvNewFrame): Set env->ex in all cases.
+
 2002-11-09  Tom Tromey  <tromey@redhat.com>
 
        * java/applet/Applet.java, java/applet/AppletContext.java,

diff --git a/libjava/jni.cc b/libjava/jni.cc
index 9865ce42a4673c264a43577b48dc2272bccb0ac9..000557875e1793a200c0958db5bd0f2a5296ed23 100644 (file)
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -1984,9 +1984,9 @@ _Jv_GetJNIEnvNewFrame (jclass klass)
     {
       env = (JNIEnv *) _Jv_MallocUnchecked (sizeof (JNIEnv));
       env->p = &_Jv_JNIFunctions;
-      env->ex = NULL;
       env->klass = klass;
       env->locals = NULL;
+      // We set env->ex below.
 
       _Jv_SetCurrentJNIEnv (env);
     }
@@ -1999,11 +1999,13 @@ _Jv_GetJNIEnvNewFrame (jclass klass)
   frame->marker = MARK_SYSTEM;
   frame->size = FRAME_SIZE;
   frame->next = env->locals;
-  env->locals = frame;
 
   for (int i = 0; i < frame->size; ++i)
     frame->vec[i] = NULL;
 
+  env->locals = frame;
+  env->ex = NULL;
+
   return env;
 }