master
Sam Brannen 9 years ago
parent 2fa1caca0c
commit b9e461a54f
  1. 2
      spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java

@ -1516,7 +1516,7 @@ public abstract class AnnotationUtils {
static List<String> getAttributeAliasNames(Method attribute) { static List<String> getAttributeAliasNames(Method attribute) {
Assert.notNull(attribute, "attribute must not be null"); Assert.notNull(attribute, "attribute must not be null");
AliasDescriptor descriptor = AliasDescriptor.from(attribute); AliasDescriptor descriptor = AliasDescriptor.from(attribute);
return (descriptor == null ? Collections.<String> emptyList() : descriptor.getAttributeAliasNames()); return (descriptor != null ? descriptor.getAttributeAliasNames() : Collections.<String> emptyList());
} }
/** /**

Loading…
Cancel
Save