8310890: Normalize identifier names

Reviewed-by: naoto, rriggs
This commit is contained in:
Pavel Rappo 2023-06-27 15:47:29 +00:00
parent 58bb6555e7
commit f6133edb08
10 changed files with 184 additions and 184 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2023, 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
@ -383,20 +383,20 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable {
continue;
String member = memberMethod.getName();
Object ourValue = memberValues.get(member);
Object hisValue = null;
AnnotationInvocationHandler hisHandler = asOneOfUs(o);
if (hisHandler != null) {
hisValue = hisHandler.memberValues.get(member);
Object otherValue = null;
AnnotationInvocationHandler otherHandler = asOneOfUs(o);
if (otherHandler != null) {
otherValue = otherHandler.memberValues.get(member);
} else {
try {
hisValue = memberMethod.invoke(o);
otherValue = memberMethod.invoke(o);
} catch (InvocationTargetException e) {
return false;
} catch (IllegalAccessException e) {
throw new AssertionError(e);
}
}
if (!memberValueEquals(ourValue, hisValue))
if (!memberValueEquals(ourValue, otherValue))
return false;
}
return true;