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

natClassLoader.cc (_Jv_NewClass): Use _Jv_RegisterInitiatingLoader to register array classes, not _Jv_RegisterClass.

Browse source 
* java/lang/natClassLoader.cc (_Jv_NewClass): Use
	_Jv_RegisterInitiatingLoader to register array classes, not
	_Jv_RegisterClass.
	(_Jv_RegisterInitiatingLoader): Give up if called very early during
	bootstrapping. Add a FIXME to handle this case better.

From-SVN: r99993
This commit is contained in:
Bryce McKinlay 2005-05-19 22:24:26 +00:00 • committed by Bryce McKinlay
parent cabf144776
commit 146e2904bc
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -127,6 +127,14 @@ _Jv_RegisterInitiatingLoader (jclass klass, java::lang::ClassLoader *loader)
{
if (! loader)
loader = java::lang::VMClassLoader::bootLoader;
if (! loader)
{
// Very early in the bootstrap process, the Bootstrap classloader may
// not exist yet.
// FIXME: We could maintain a list of these and come back and register
// them later.
return;
}
loader->loadedClasses->put(klass->name->toString(), klass);
}
@ -346,7 +354,7 @@ _Jv_NewClass (_Jv_Utf8Const *name, jclass superclass,
ret->superclass = superclass;
ret->loader = loader;
_Jv_RegisterClass (ret);
_Jv_RegisterInitiatingLoader (ret, loader);
return ret;
}