From 51d6eed48eace41bef16aa1d4401e0fb081e7d5d Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@redhat.com>
Date: Fri, 20 Dec 2002 02:06:21 +0000
Subject: [PATCH] natResourceBundle.cc: Include
 ArrayIndexOutOfBoundsException.h.

2002-12-19  Andrew Haley  <aph@redhat.com>

	* java/util/natResourceBundle.cc: Include
	ArrayIndexOutOfBoundsException.h.
	(getCallingClassLoader): Don't put upper bound on stack search.
	Catch ArrayIndexOutOfBoundsException.

From-SVN: r60348
---
 libjava/ChangeLog                      |  7 +++++++
 libjava/java/util/natResourceBundle.cc | 15 +++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 64c58d0da16..75c44a47a1c 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-19  Andrew Haley  <aph@redhat.com>
+
+	* java/util/natResourceBundle.cc: Include
+	ArrayIndexOutOfBoundsException.h.
+	(getCallingClassLoader): Don't put upper bound on stack search.
+	Catch ArrayIndexOutOfBoundsException.
+
 2002-12-19  Tom Tromey  <tromey@redhat.com>
 
 	* libtool-version: Increased `current'.
diff --git a/libjava/java/util/natResourceBundle.cc b/libjava/java/util/natResourceBundle.cc
index 21a9565c996..adb83f92b26 100644
--- a/libjava/java/util/natResourceBundle.cc
+++ b/libjava/java/util/natResourceBundle.cc
@@ -16,17 +16,24 @@ details.  */
 #include <java/lang/SecurityManager.h>
 #include <java/lang/ClassLoader.h>
 #include <java/lang/Class.h>
+#include <java/lang/ArrayIndexOutOfBoundsException.h>
 #include <gnu/gcj/runtime/StackTrace.h>
 
 java::lang::ClassLoader *
 java::util::ResourceBundle::getCallingClassLoader ()
 {
   gnu::gcj::runtime::StackTrace *t = new gnu::gcj::runtime::StackTrace(6);
-  for (int i = 3; i < 6; ++i)
+  try
+    {
+      for (int i = 3; ; ++i)
+	{
+	  jclass klass = t->classAt(i);
+	  if (klass != NULL)
+	    return klass->getClassLoaderInternal();
+	}
+    }
+  catch (::java::lang::ArrayIndexOutOfBoundsException *e)
     {
-      jclass klass = t->classAt(i);
-      if (klass != NULL)
-	return klass->getClassLoaderInternal();
     }
   return NULL;
 }