diff options
| author | Tom Tromey <tromey@cygnus.com> | 2000-01-13 18:13:31 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-01-13 18:13:31 +0000 |
| commit | 357100a3ef6fd07188328be06fcc24156182affc (patch) | |
| tree | 9b88c53a8272e87474d3f820ffdd34c305d7c64c | |
| parent | 7ea0e99c7cfcf1901fa771bcc43fc26db692df01 (diff) | |
| download | gcc-357100a3ef6fd07188328be06fcc24156182affc.zip gcc-357100a3ef6fd07188328be06fcc24156182affc.tar.gz gcc-357100a3ef6fd07188328be06fcc24156182affc.tar.bz2 | |
natClassLoader.cc (_Jv_FindClass): Register `loader', not system loader, as initiating loader.
* java/lang/natClassLoader.cc (_Jv_FindClass): Register `loader',
not system loader, as initiating loader.
From-SVN: r31395
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a46f7fe..8ffff03 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2000-01-13 Tom Tromey <tromey@cygnus.com> + + * java/lang/natClassLoader.cc (_Jv_FindClass): Register `loader', + not system loader, as initiating loader. + 2000-01-11 Tom Tromey <tromey@cygnus.com> * java/lang/natSystem.cc (getpwuid_adaptor): New adaptor for diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 2a73ba6..6403626 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -1,6 +1,6 @@ // natClassLoader.cc - Implementation of java.lang.ClassLoader native methods. -/* Copyright (C) 1999 Cygnus Solutions +/* Copyright (C) 1999, 2000 Cygnus Solutions This file is part of libgcj. @@ -437,13 +437,11 @@ jclass _Jv_FindClass (_Jv_Utf8Const *name, // Load using a user-defined loader, jvmspec 5.3.2 klass = loader->loadClass(sname, false); - // if "loader" delegateted the loadClass operation - // to another loader, register explicitly - // that he is also an initiating loader of the - // given class. - + // If "loader" delegated the loadClass operation to another + // loader, explicitly register that it is also an initiating + // loader of the given class. if (klass && (klass->getClassLoader () != loader)) - _Jv_RegisterInitiatingLoader (klass, 0); + _Jv_RegisterInitiatingLoader (klass, loader); } else { @@ -454,7 +452,7 @@ jclass _Jv_FindClass (_Jv_Utf8Const *name, sys = java::lang::ClassLoader::getSystemClassLoader (); } - // Load using the bootstrap loader jmspec 5.3.1. + // Load using the bootstrap loader jvmspec 5.3.1. klass = sys->loadClass (sname, false); // Register that we're an initiating loader. |