Commit b08122a7 by Tom Tromey Committed by Tom Tromey

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

From-SVN: r58971
parent e9986d3a
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> 2002-11-09 Tom Tromey <tromey@redhat.com>
* java/applet/Applet.java, java/applet/AppletContext.java, * java/applet/Applet.java, java/applet/AppletContext.java,
......
...@@ -1984,9 +1984,9 @@ _Jv_GetJNIEnvNewFrame (jclass klass) ...@@ -1984,9 +1984,9 @@ _Jv_GetJNIEnvNewFrame (jclass klass)
{ {
env = (JNIEnv *) _Jv_MallocUnchecked (sizeof (JNIEnv)); env = (JNIEnv *) _Jv_MallocUnchecked (sizeof (JNIEnv));
env->p = &_Jv_JNIFunctions; env->p = &_Jv_JNIFunctions;
env->ex = NULL;
env->klass = klass; env->klass = klass;
env->locals = NULL; env->locals = NULL;
// We set env->ex below.
_Jv_SetCurrentJNIEnv (env); _Jv_SetCurrentJNIEnv (env);
} }
...@@ -1999,11 +1999,13 @@ _Jv_GetJNIEnvNewFrame (jclass klass) ...@@ -1999,11 +1999,13 @@ _Jv_GetJNIEnvNewFrame (jclass klass)
frame->marker = MARK_SYSTEM; frame->marker = MARK_SYSTEM;
frame->size = FRAME_SIZE; frame->size = FRAME_SIZE;
frame->next = env->locals; frame->next = env->locals;
env->locals = frame;
for (int i = 0; i < frame->size; ++i) for (int i = 0; i < frame->size; ++i)
frame->vec[i] = NULL; frame->vec[i] = NULL;
env->locals = frame;
env->ex = NULL;
return env; return env;
} }
......
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