OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natClassLoader.cc: Include VirtualMachineError.h

Browse Source 
2001-09-05  Corey Minyard  <minyard@acm.org>
	    Tom Tromey  <tromey@redhat.com>

	* java/lang/natClassLoader.cc: Include VirtualMachineError.h
	(_Jv_RegisterClassHookDefault): Throw error if a class is
	registered twice.

Co-Authored-By: Tom Tromey <tromey@redhat.com>

From-SVN: r45418
This commit is contained in:
Corey Minyard 2001-09-05 17:48:18 +00:00 committed by Tom Tromey
parent c1a13c5f88
commit c946ec44f8
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
2001-09-05 Corey Minyard <minyard@acm.org>
Tom Tromey <tromey@redhat.com>
* java/lang/natClassLoader.cc: Include VirtualMachineError.h
(_Jv_RegisterClassHookDefault): Throw error if a class is
registered twice.
2001-09-05 Tom Tromey <tromey@redhat.com>
* java/lang/natSystem.cc (init_properties): Default locale is

17
libjava/java/lang/natClassLoader.cc
View File

@ -33,6 +33,7 @@ details. */
#include <java/lang/ClassNotFoundException.h>
#include <java/lang/ClassCircularityError.h>
#include <java/lang/IncompatibleClassChangeError.h>
#include <java/lang/VirtualMachineError.h>
#include <java/lang/reflect/Modifier.h>
#include <java/lang/Runtime.h>
#include <java/lang/StringBuffer.h>
@ -453,6 +454,22 @@ void
_Jv_RegisterClassHookDefault (jclass klass)
{
jint hash = HASH_UTF (klass->name);
jclass check_class = loaded_classes[hash];
// If the class is already registered, don't re-register it.
while (check_class != NULL)
{
if (check_class == klass)
{
// If you get this, it means you have the same class in two
// different libraries.
throw new java::lang::VirtualMachineError (JvNewStringLatin1 ("class registered twice"));
}
check_class = check_class->next;
}
klass->next = loaded_classes[hash];
loaded_classes[hash] = klass;
}