diff options
| author | Tom Tromey <tromey@redhat.com> | 2003-01-21 21:16:46 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-01-21 21:16:46 +0000 |
| commit | 570168b2b34cc7d691387635ea0ec1584c7dd18f (patch) | |
| tree | 2449c63b31a9095d17b7d23398ed9be796f4a60c /libjava | |
| parent | 490c57bb8e27ad359318b24db17db30e37a63738 (diff) | |
| download | gcc-570168b2b34cc7d691387635ea0ec1584c7dd18f.zip gcc-570168b2b34cc7d691387635ea0ec1584c7dd18f.tar.gz gcc-570168b2b34cc7d691387635ea0ec1584c7dd18f.tar.bz2 | |
natResourceBundle.cc (getCallingClassLoader): Start search at 2, not 3.
* java/util/natResourceBundle.cc (getCallingClassLoader): Start
search at 2, not 3.
From-SVN: r61574
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/natResourceBundle.cc | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4b44d80..31f95ab 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-01-21 Tom Tromey <tromey@redhat.com> + + * java/util/natResourceBundle.cc (getCallingClassLoader): Start + search at 2, not 3. + 2003-01-21 Vladimir Puskas <vpuskas@eunet.yu> * java/io/natFileWin32.cc (isAbsolute): Check path length before diff --git a/libjava/java/util/natResourceBundle.cc b/libjava/java/util/natResourceBundle.cc index adb83f9..35e90ee 100644 --- a/libjava/java/util/natResourceBundle.cc +++ b/libjava/java/util/natResourceBundle.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 Free Software Foundation +/* Copyright (C) 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -25,7 +25,10 @@ java::util::ResourceBundle::getCallingClassLoader () gnu::gcj::runtime::StackTrace *t = new gnu::gcj::runtime::StackTrace(6); try { - for (int i = 3; ; ++i) + /* Frame 0 is this method, frame 1 is getBundle, so starting at + frame 2 we might see the user's class. FIXME: should account + for reflection, JNI, etc, here. */ + for (int i = 2; ; ++i) { jclass klass = t->classAt(i); if (klass != NULL) |