From 4cbc52967cf5c741c972716f34ffcd9f0413b007 Mon Sep 17 00:00:00 2001 From: tromey Date: Thu, 13 Jan 2000 18:13:31 +0000 Subject: * java/lang/natClassLoader.cc (_Jv_FindClass): Register `loader', not system loader, as initiating loader. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31395 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/lang/natClassLoader.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 2a73ba69053..64036266d64 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. -- cgit v1.2.3