From acefd8381d2df6603689d08e95752642f6e87012 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Sun, 2 Nov 2014 11:38:35 +0100
Subject: [PATCH] Polishing

---
 .../core/convert/TypeDescriptor.java              |  2 +-
 ...ingWildcardServletTilesApplicationContext.java | 15 +++++++--------
 ...ingWildcardServletTilesApplicationContext.java |  8 ++++----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
index 1467ab614c3..b605032d8f4 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
@@ -45,7 +45,7 @@ public class TypeDescriptor implements Serializable {
 
 	static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0];
 
-	private static final Map<Class<?>, TypeDescriptor> commonTypesCache = new HashMap<Class<?>, TypeDescriptor>();
+	private static final Map<Class<?>, TypeDescriptor> commonTypesCache = new HashMap<Class<?>, TypeDescriptor>(18);
 
 	private static final Class<?>[] CACHED_COMMON_TYPES = {
 			boolean.class, Boolean.class, byte.class, Byte.class, char.class, Character.class,
diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java
index e79fe8d5dd0..e75e5891ecf 100644
--- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java
+++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java
@@ -30,6 +30,7 @@ import org.apache.tiles.request.servlet.ServletApplicationContext;
 
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.support.ServletContextResourcePatternResolver;
 
@@ -53,22 +54,20 @@ public class SpringWildcardServletTilesApplicationContext extends ServletApplica
 
 	@Override
 	public ApplicationResource getResource(String localePath) {
-		ApplicationResource retValue = null;
 		Collection<ApplicationResource> urlSet = getResources(localePath);
-		if (urlSet != null && !urlSet.isEmpty()) {
-			retValue = urlSet.iterator().next();
+		if (!CollectionUtils.isEmpty(urlSet)) {
+			return urlSet.iterator().next();
 		}
-		return retValue;
+		return null;
 	}
 
 	@Override
 	public ApplicationResource getResource(ApplicationResource base, Locale locale) {
-		ApplicationResource retValue = null;
 		Collection<ApplicationResource> urlSet = getResources(base.getLocalePath(locale));
-		if (urlSet != null && !urlSet.isEmpty()) {
-			retValue = urlSet.iterator().next();
+		if (!CollectionUtils.isEmpty(urlSet)) {
+			return urlSet.iterator().next();
 		}
-		return retValue;
+		return null;
 	}
 
 	@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringWildcardServletTilesApplicationContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringWildcardServletTilesApplicationContext.java
index f24f6cf9cb3..b582ee3a419 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringWildcardServletTilesApplicationContext.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/SpringWildcardServletTilesApplicationContext.java
@@ -26,6 +26,7 @@ import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
 
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.support.ServletContextResourcePatternResolver;
 
@@ -48,12 +49,11 @@ public class SpringWildcardServletTilesApplicationContext extends ServletTilesAp
 
 	@Override
 	public URL getResource(String path) throws IOException {
-		URL retValue = null;
 		Set<URL> urlSet = getResources(path);
-		if (urlSet != null && !urlSet.isEmpty()) {
-			retValue = urlSet.iterator().next();
+		if (!CollectionUtils.isEmpty(urlSet)) {
+			return urlSet.iterator().next();
 		}
-		return retValue;
+		return null;
 	}
 
 	@Override