diff options
| author | Andrew Haley <aph@gcc.gnu.org> | 2007-03-02 19:34:18 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2007-03-02 19:34:18 +0000 |
| commit | 386e9d408b56891b27b419e89f67320ff36f71aa (patch) | |
| tree | 562b74cc5c552b0b0ed296d931348bea16eafd22 /libjava/java | |
| parent | 6e7e772dceb2f238c2645ad4c695787fd69d381d (diff) | |
| download | gcc-386e9d408b56891b27b419e89f67320ff36f71aa.zip gcc-386e9d408b56891b27b419e89f67320ff36f71aa.tar.gz gcc-386e9d408b56891b27b419e89f67320ff36f71aa.tar.bz2 | |
AnnotationInvocationHandler.java: Generify in a few places.
2007-03-02 Andrew Haley <aph@redhat.com>
* sun/reflect/annotation/AnnotationInvocationHandler.java:
Generify in a few places.
(equals): Rewrite to use invoke on local proxy.
(deepToString): Remove most of it.
(toString): Make nonstatic.
(arrayClone): Delete.
(coerce): New method.
(invoke): Rewrite to handle gcj's structures correctly.
* java/lang/natClass.cc (getDeclaredAnnotations): Fix test for
null loader.
* sources.am: Regenerate.
* Makefile.am: Likewise.
From-SVN: r122485
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/natClass.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index 8af533b..ea55546 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -1331,9 +1331,8 @@ java::lang::Class::getDeclaredAnnotations(jint /* jv_attr_type */ member_type, if (bytes == NULL) return 0; - ClassLoader *trueLoader = loader; - if (trueLoader == NULL) - trueLoader = (ClassLoader *)VMClassLoader::bootLoader; + if (loader == NULL) + loader = (ClassLoader *)VMClassLoader::bootLoader; result = (loader->getDeclaredAnnotations (this, member_type, member_index, kind_req)); |