natClassLoader.cc (_Jv_RegisterClassHookDefault): Re-enable duplicate class registrat...

	* java/lang/natClassLoader.cc (_Jv_RegisterClassHookDefault):
	Re-enable duplicate class registration error.

From-SVN: r92447

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 48a36b6c56ef145984422007b9b416fba0d15047..626cc6e3c0f93b0514eb7f2a036b3a48dedd0b1d 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,8 @@
 2004-12-20  Tom Tromey  <tromey@redhat.com>
 
+       * java/lang/natClassLoader.cc (_Jv_RegisterClassHookDefault):
+       Re-enable duplicate class registration error.
+
        * testsuite/libjava.jar/jar.exp (gcj_jar_interpret): Updated.
        * testsuite/libjava.verify/verify.exp (gcj_verify_run): Updated.
        * testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Updated.

diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index dd5cd463cfaa83a5fb91a4793527c329bd54cdca..f6571bd66bacc463d7d8344aed8d4200dc2d3743 100644 (file)
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -201,8 +201,8 @@ _Jv_RegisterClassHookDefault (jclass klass)
   // The BC ABI makes this check unnecessary: we always resolve all
   // data references via the appropriate class loader, so the kludge
   // that required this check has gone.
-#if 0
   // If the class is already registered, don't re-register it.
+  jclass check_class = klass->next;
   while (check_class != NULL)
     {
       if (check_class == klass)
@@ -227,7 +227,6 @@ _Jv_RegisterClassHookDefault (jclass klass)
 
       check_class = check_class->next;
     }
-#endif
 
   // FIXME: this is really bogus!
   if (! klass->engine)