From: aph Date: Fri, 2 Mar 2007 19:34:18 +0000 (+0000) Subject: 2007-03-02 Andrew Haley X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=ca28433810f6eaede8edbb62b0659ceafcce9955 2007-03-02 Andrew Haley * 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 --- 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));