diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-03-02 19:34:18 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-03-02 19:34:18 +0000 |
| commit | ca28433810f6eaede8edbb62b0659ceafcce9955 (patch) | |
| tree | 562b74cc5c552b0b0ed296d931348bea16eafd22 /libjava/java | |
| parent | 085b7aab6cdbf28e81ba29002ec2063911ad4b89 (diff) | |
| download | gcc-ca28433810f6eaede8edbb62b0659ceafcce9955.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122485 138bc75d-0d04-0410-961f-82ee72b054a4
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 8af533b7769..ea55546d897 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)); |