* jni.cc (_Jv_JNI_NewLocalRef): Search other frames.

From-SVN: r43415

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9d20d86d6eeb3c044dcddd1d4ca5b2f658250723..bb1463c4b86f930771df57878d5e489a21e71a30 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-15  Tom Tromey  <tromey@redhat.com>
+
+       * jni.cc (_Jv_JNI_NewLocalRef): Search other frames.
+
 2001-06-15  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/natRuntime.cc (_Jv_FindSymbolInExecutable): Return

diff --git a/libjava/jni.cc b/libjava/jni.cc
index 15f69bcce70fa5b255261f4fd277adf7633ba47f..3944b0e0bea0e2f9386c95c725e49da68c845fe4 100644 (file)
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -278,16 +278,23 @@ _Jv_JNI_NewLocalRef (JNIEnv *env, jobject obj)
   // Try to find an open slot somewhere in the topmost frame.
   _Jv_JNI_LocalFrame *frame = env->locals;
   bool done = false, set = false;
-  while (frame != NULL && ! done)
+  for (; frame != NULL && ! done; frame = frame->next)
     {
       for (int i = 0; i < frame->size; ++i)
-       if (frame->vec[i] == NULL)
-         {
-           set = true;
-           done = true;
-           frame->vec[i] = obj;
-           break;
-         }
+       {
+         if (frame->vec[i] == NULL)
+           {
+             set = true;
+             done = true;
+             frame->vec[i] = obj;
+             break;
+           }
+       }
+
+      // If we found a slot, or if the frame we just searched is the
+      // mark frame, then we are done.
+      if (done || frame->marker != MARK_NONE)
+       break;
     }
 
   if (! set)