aboutsummaryrefslogtreecommitdiff
path: root/libjava/jni.cc
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2002-11-10 08:00:48 +0000
committerTom Tromey <tromey@gcc.gnu.org>2002-11-10 08:00:48 +0000
commitb08122a718666156bf9d030aeb1d5d94e3a7e9f6 (patch)
tree7a2449d70b3189ae9304a3d0ab34423d6e8ffd66 /libjava/jni.cc
parente9986d3ae28c561c4de3eaeb8957c2b6122b6f91 (diff)
downloadgcc-b08122a718666156bf9d030aeb1d5d94e3a7e9f6.zip
gcc-b08122a718666156bf9d030aeb1d5d94e3a7e9f6.tar.gz
gcc-b08122a718666156bf9d030aeb1d5d94e3a7e9f6.tar.bz2
* jni.cc (_Jv_GetJNIEnvNewFrame): Set env->ex in all cases.
From-SVN: r58971
Diffstat (limited to 'libjava/jni.cc')
-rw-r--r--libjava/jni.cc6
1 files changed, 4 insertions, 2 deletions
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;
}