diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-21 21:16:46 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-21 21:16:46 +0000 |
| commit | 5eb1a9023471d13018bda42df4c80cef90571895 (patch) | |
| tree | 2449c63b31a9095d17b7d23398ed9be796f4a60c /libjava | |
| parent | 929ed800c974f2f87f6ed27132200386f5245250 (diff) | |
| download | gcc-5eb1a9023471d13018bda42df4c80cef90571895.tar.gz | |
* java/util/natResourceBundle.cc (getCallingClassLoader): Start
search at 2, not 3.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61574 138bc75d-0d04-0410-961f-82ee72b054a4
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 4b44d80b735..31f95abbf6d 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 adb83f92b26..35e90ee23d3 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) |