FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

natClassLoader.cc (_Jv_FindClass): Register `loader', not system loader, as initiating loader.

Browse source 
* java/lang/natClassLoader.cc (_Jv_FindClass): Register `loader',
	not system loader, as initiating loader.

From-SVN: r31395
This commit is contained in:
Tom Tromey 2000-01-13 18:13:31 +00:00 • committed by Tom Tromey
parent 7ea0e99c7c
commit 357100a3ef
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -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> 2000-01-11 Tom Tromey <tromey@cygnus.com>
* java/lang/natSystem.cc (getpwuid_adaptor): New adaptor for * java/lang/natSystem.cc (getpwuid_adaptor): New adaptor for

14
libjava/java/lang/natClassLoader.cc
View file

@ -1,6 +1,6 @@
// natClassLoader.cc - Implementation of java.lang.ClassLoader native methods. // 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. 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 // Load using a user-defined loader, jvmspec 5.3.2
klass = loader->loadClass(sname, false); klass = loader->loadClass(sname, false);
// if "loader" delegateted the loadClass operation // If "loader" delegated the loadClass operation to another
// to another loader, register explicitly // loader, explicitly register that it is also an initiating
// that he is also an initiating loader of the // loader of the given class.
// given class.
if (klass && (klass->getClassLoader () != loader)) if (klass && (klass->getClassLoader () != loader))
_Jv_RegisterInitiatingLoader (klass, 0); _Jv_RegisterInitiatingLoader (klass, loader);
} }
else else
{ {
@ -454,7 +452,7 @@ jclass _Jv_FindClass (_Jv_Utf8Const *name,
sys = java::lang::ClassLoader::getSystemClassLoader (); 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); klass = sys->loadClass (sname, false);
// Register that we're an initiating loader. // Register that we're an initiating loader.