From b9e461a54f9e1bd5be53d48e1c87e3cd6e252bca Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 2 Sep 2015 15:07:49 +0200
Subject: [PATCH] Polishing

---
 .../org/springframework/core/annotation/AnnotationUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
index dee5c73f05..ed6982ca73 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java
+++ b/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) {
 		Assert.notNull(attribute, "attribute must not be null");
 		AliasDescriptor descriptor = AliasDescriptor.from(attribute);
-		return (descriptor == null ? Collections.<String> emptyList() : descriptor.getAttributeAliasNames());
+		return (descriptor != null ? descriptor.getAttributeAliasNames() : Collections.<String> emptyList());
 	}
 
 	/**