diff options
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/jni.cc | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 33e0742..3024eb0 100644 --- 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 9865ce4..0005578 100644 --- 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; } |