root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Sam Brannen 2019-12-02 16:22:40 +01:00
parent 50ac8ad8b7
commit 279777b2f3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java
View File

@ -475,7 +475,7 @@ final class AnnotationTypeMapping {
/**
* Get the mirror sets for this type mapping.
* @return the mirrorSets the attribute mirror sets.
* @return the attribute mirror sets
*/
MirrorSets getMirrorSets() {
return this.mirrorSets;
@ -648,8 +648,7 @@ final class AnnotationTypeMapping {
if (isDefaultValue || ObjectUtils.nullSafeEquals(lastValue, value)) {
continue;
}
if (lastValue != null &&
!ObjectUtils.nullSafeEquals(lastValue, value)) {
if (lastValue != null && !ObjectUtils.nullSafeEquals(lastValue, value)) {
String on = (source != null) ? " declared on " + source : "";
throw new AnnotationConfigurationException(String.format(
"Different @AliasFor mirror values for annotation [%s]%s; attribute '%s' " +