From 570168b2b34cc7d691387635ea0ec1584c7dd18f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 21 Jan 2003 21:16:46 +0000 Subject: [PATCH] natResourceBundle.cc (getCallingClassLoader): Start search at 2, not 3. * java/util/natResourceBundle.cc (getCallingClassLoader): Start search at 2, not 3. From-SVN: r61574 --- libjava/ChangeLog | 5 +++++ 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 + + * java/util/natResourceBundle.cc (getCallingClassLoader): Start + search at 2, not 3. + 2003-01-21 Vladimir Puskas * 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) -- 2.30.2