archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8169629: Annotations with lambda expressions cause AnnotationFormatError

Browse source 
Reviewed-by: jfranck
This commit is contained in:
Joe Darcy 2021-04-01 16:46:32 +00:00
parent c04a743bd4
commit 328e9514a8
2 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2021, 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
@ -370,6 +370,8 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
if (!type.isInstance(o))
return false;
for (Method memberMethod : getMemberMethods()) {
if (memberMethod.isSynthetic())
continue;
String member = memberMethod.getName();
Object ourValue = memberValues.get(member);
Object hisValue = null;
@ -491,6 +493,17 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
*/
boolean valid = true;
for(Method method : memberMethods) {
int modifiers = method.getModifiers();
// Skip over methods that may be a static initializer or
// similar construct. A static initializer may be used for
// purposes such as initializing a lambda stored in an
// interface field.
if (method.isSynthetic() &&
(modifiers & (Modifier.STATIC | Modifier.PRIVATE)) != 0 &&
method.getParameterCount() == 0) {
continue;
}
/*
* "By virtue of the AnnotationTypeElementDeclaration
* production, a method declaration in an annotation type
@ -501,7 +514,7 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
* production, a method declaration in an annotation type
* declaration cannot be default or static."
*/
if (method.getModifiers() != (Modifier.PUBLIC | Modifier.ABSTRACT) ||
if (modifiers != (Modifier.PUBLIC | Modifier.ABSTRACT) ||
method.isDefault() ||
method.getParameterCount() != 0 ||
method.getExceptionTypes().length != 0) {