stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8071859: AnnotationInvocationHandler.equals(Object) return true when apply to annotation

Browse Source 
Reviewed-by: mchung, chegar
This commit is contained in:
Joe Darcy 2016-06-16 13:00:34 -07:00
parent f98b4f5aea
commit b2795ca463
2 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java
View File

@ -62,7 +62,7 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
// Handle Object and Annotation methods
if (member.equals("equals") && paramTypes.length == 1 &&
paramTypes[0] == Object.class)
return equalsImpl(args[0]);
return equalsImpl(proxy, args[0]);
if (paramTypes.length != 0)
throw new AssertionError("Too many parameters for an annotation method");
@ -209,8 +209,8 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
/**
* Implementation of dynamicProxy.equals(Object o)
*/
private Boolean equalsImpl(Object o) {
if (o == this)
private Boolean equalsImpl(Object proxy, Object o) {
if (o == proxy)
return true;
if (!type.isInstance(o))

55
jdk/test/java/lang/annotation/EqualityTest.java Normal file
View File

@ -0,0 +1,55 @@
/*
* 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 8071859
* @summary Check annotation equality behavior against the invocation handler
*/
import java.lang.annotation.*;
import java.lang.reflect.*;
@TestAnnotation
public class EqualityTest {
public static void main(String... args) throws Exception {
TestAnnotation annotation =
EqualityTest.class.getAnnotation(TestAnnotation.class);
InvocationHandler handler = Proxy.getInvocationHandler(annotation);
testEquality(annotation, handler, false);
testEquality(annotation, annotation, true);
testEquality(handler, handler, true);
}
private static void testEquality(Object a, Object b, boolean expected) {
boolean result = a.equals(b);
if (result != b.equals(a) || result != expected)
throw new RuntimeException("Unexpected result");
}
}
@Retention(RetentionPolicy.RUNTIME)
@interface TestAnnotation {
}