yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

natClassLoader.cc (_Jv_UnregisterClass): Handle case where class' name is NULL.

Browse Source 
* java/lang/natClassLoader.cc (_Jv_UnregisterClass): Handle case
	where class' name is NULL.
	(_Jv_FindClass): Don't wait for class state.
	* java/lang/natVMClassLoader.cc (defineClass): Only unregister if
	name found.
	* include/java-interp.h (_Jv_DefineClass): Updated.
	* defineclass.cc (_Jv_DefineClass): Added 'name_result' argument.
	(struct _Jv_ClassReader): Likewise.
	(found_name): New field.
	(handleClassBegin): Set *found_name.
	(_Jv_VerifyMethodSignature): Handle case where ptr==NULL.
	(handleClassBegin): Throw error if super class not set.
	(read_methods): Correctly call check_tag and prepare_pool_entry.

From-SVN: r101301
This commit is contained in:
Tom Tromey
2005-06-24 22:48:33 +00:00
committed by Tom Tromey
parent b7938f087d
commit 42c5169549
5 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/java/lang/natVMClassLoader.cc
+4 -2
View File
@@ -71,16 +71,18 @@ java::lang::VMClassLoader::defineClass (java::lang::ClassLoader *loader,
klass->name = name2;
}
_Jv_Utf8Const *found_name = NULL;
try
{
_Jv_DefineClass (klass, data, offset, length, pd);
_Jv_DefineClass (klass, data, offset, length, pd, &found_name);
}
catch (java::lang::Throwable *ex)
{
klass->state = JV_STATE_ERROR;
klass->notifyAll ();
_Jv_UnregisterInitiatingLoader (klass, klass->loader);
if (found_name != NULL)
_Jv_UnregisterInitiatingLoader (klass, klass->loader);
// If EX is not a ClassNotFoundException, that's ok, because we
// account for the possibility in defineClass().