summaryrefslogtreecommitdiffstats
path: root/libjava/jni.cc
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2002-11-10 08:00:48 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2002-11-10 08:00:48 +0000
commit412e86f0c97de92d893cf7bfe857021e395a81a3 (patch)
tree7a2449d70b3189ae9304a3d0ab34423d6e8ffd66 /libjava/jni.cc
parentf1872fe0c4937b8642415ef6e4a9ed1c9ead8b1d (diff)
downloadppe42-gcc-412e86f0c97de92d893cf7bfe857021e395a81a3.tar.gz
ppe42-gcc-412e86f0c97de92d893cf7bfe857021e395a81a3.zip
* jni.cc (_Jv_GetJNIEnvNewFrame): Set env->ex in all cases.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@58971 138bc75d-0d04-0410-961f-82ee72b054a4
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 9865ce42a46..000557875e1 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;
}
OpenPOWER on IntegriCloud