# HG changeset patch # User jjg # Date 1252444106 25200 # Node ID 7f888c00fad7cc81bd12c203564c642b15be4dc6 # Parent 69ac41cb327bda4bc3e54d4cbee5f64568d4e3f2 6709246: ClassCastException in javadoc Reviewed-by: jjg Contributed-by: ahe@google.com diff -r 69ac41cb327b -r 7f888c00fad7 langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java --- a/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java Tue Sep 08 13:53:10 2009 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java Tue Sep 08 14:08:26 2009 -0700 @@ -60,7 +60,12 @@ */ public AnnotationTypeDoc annotationType() { ClassSymbol atsym = (ClassSymbol)annotation.type.tsym; - return (AnnotationTypeDoc)env.getClassDoc(atsym); + if (annotation.type.isErroneous()) { + env.warning(null, "javadoc.class_not_found", annotation.type.toString()); + return new AnnotationTypeDocImpl(env, atsym); + } else { + return (AnnotationTypeDoc)env.getClassDoc(atsym); + } } /** diff -r 69ac41cb327b -r 7f888c00fad7 langtools/test/tools/javadoc/annotations/missing/Main.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javadoc/annotations/missing/Main.java Tue Sep 08 14:08:26 2009 -0700 @@ -0,0 +1,52 @@ +/* + * Copyright 2009 Google, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 6709246 + * @summary Class-cast exception when annotation type is missing. + * @library ../../lib + */ + +import java.io.IOException; +import com.sun.javadoc.RootDoc; +import com.sun.javadoc.ClassDoc; +import com.sun.javadoc.AnnotationDesc; + +public class Main extends Tester.Doclet { + + private static final Tester tester = new Tester("Main", "somepackage"); + + public static void main(String... args) throws Exception { + tester.run(); + } + + public static boolean start(RootDoc root) { + for (ClassDoc d : root.classes()) { + for (AnnotationDesc a : d.annotations()) { + System.out.println(a.annotationType()); + } + } + return true; + } +} diff -r 69ac41cb327b -r 7f888c00fad7 langtools/test/tools/javadoc/annotations/missing/somepackage/MissingAnnotationClass.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javadoc/annotations/missing/somepackage/MissingAnnotationClass.java Tue Sep 08 14:08:26 2009 -0700 @@ -0,0 +1,31 @@ +/* + * Copyright 2009 Google, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +package somepackage; + +/** + * This class has an annotation which is not available. + */ +@NoSuchAnnotation +public class MissingAnnotationClass { +}