diff options
| author | Tom Tromey <tromey@redhat.com> | 2004-12-21 01:03:55 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2004-12-21 01:03:55 +0000 |
| commit | f5b25f8cca4732d0c64d20ea20792b2941ac7bb3 (patch) | |
| tree | f664d7ea6181375360d44408a5d02c7efa5763aa /libjava | |
| parent | d2b55bc5592e79c375a73647d8031c4af403aec2 (diff) | |
| download | gcc-f5b25f8cca4732d0c64d20ea20792b2941ac7bb3.zip gcc-f5b25f8cca4732d0c64d20ea20792b2941ac7bb3.tar.gz gcc-f5b25f8cca4732d0c64d20ea20792b2941ac7bb3.tar.bz2 | |
natClassLoader.cc (_Jv_RegisterClassHookDefault): Re-enable duplicate class registration error.
* java/lang/natClassLoader.cc (_Jv_RegisterClassHookDefault):
Re-enable duplicate class registration error.
From-SVN: r92447
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 3 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 48a36b6..626cc6e 100644 --- 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 dd5cd46..f6571bd 100644 --- 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) |