1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8152174: Type annotations with a missing type throw NullPointerException

Browse Source 
Reviewed-by: jfranck
This commit is contained in:
Joe Darcy 2016-07-07 10:16:47 -07:00
parent 0a0c30f0a3
commit 871852cb44
3 changed files with 80 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -351,12 +351,15 @@ public final class TypeAnnotationParser {
new LinkedHashMap<>(); new LinkedHashMap<>();
for (TypeAnnotation t : typeAnnos) { for (TypeAnnotation t : typeAnnos) {
Annotation a = t.getAnnotation(); Annotation a = t.getAnnotation();
if (a != null) {
Class<? extends Annotation> klass = a.annotationType(); Class<? extends Annotation> klass = a.annotationType();
AnnotationType type = AnnotationType.getInstance(klass); AnnotationType type = AnnotationType.getInstance(klass);
if (type.retention() == RetentionPolicy.RUNTIME) if (type.retention() == RetentionPolicy.RUNTIME &&
if (result.put(klass, a) != null) result.put(klass, a) != null) {
throw new AnnotationFormatError("Duplicate annotation for class: "+klass+": " + a); throw new AnnotationFormatError("Duplicate annotation for class: "+klass+": " + a);
} }
}
}
return result; return result;
} }

28
jdk/test/java/lang/annotation/typeAnnotations/MissingAnnotation.java Normal file
View File

@ -0,0 +1,28 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.lang.annotation.*;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE_USE)
public @interface MissingAnnotation { }

44
jdk/test/java/lang/annotation/typeAnnotations/NoNpeOnMissingAnnotation.java Normal file
View File

@ -0,0 +1,44 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8152174
* @summary Verify that a missing class file for a type use annotation doesn't cause a NPE when attempting to read the annotation.
* @compile NoNpeOnMissingAnnotation.java MissingAnnotation.java
* @run main NoNpeOnMissingAnnotation
* @clean MissingAnnotation
* @run main NoNpeOnMissingAnnotation
*/
import java.lang.annotation.*;
public class NoNpeOnMissingAnnotation {
public static void main(String... args) throws Exception {
System.out.println(NoNpeOnMissingAnnotation.class.
getDeclaredMethod("foo").
getAnnotatedReturnType());
}
@MissingAnnotation Object foo() { return null; }
}