optimized getMethodResolver implementation to actually benefit from ConcurrentHashMap

org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.ClientDataRequest;
@@ -152,7 +151,8 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 
 	private BeanExpressionContext expressionContext;
 
-	private final Map<Class<?>, PortletHandlerMethodResolver> methodResolverCache = new ConcurrentHashMap<Class<?>, PortletHandlerMethodResolver>();
+	private final Map<Class<?>, PortletHandlerMethodResolver> methodResolverCache =
+			new ConcurrentHashMap<Class<?>, PortletHandlerMethodResolver>();
 
 
 	/**
@@ -302,6 +302,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 		}
 	}
 
+
 	protected ModelAndView doHandle(PortletRequest request, PortletResponse response, Object handler) throws Exception {
 		ExtendedModelMap implicitModel = null;
 
@@ -393,17 +394,19 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 	 */
 	private PortletHandlerMethodResolver getMethodResolver(Object handler) {
 		Class handlerClass = ClassUtils.getUserClass(handler);
-		synchronized (this.methodResolverCache) {
+		PortletHandlerMethodResolver resolver = this.methodResolverCache.get(handlerClass);
-			PortletHandlerMethodResolver resolver = this.methodResolverCache.get(handlerClass);
+		if (resolver == null) {
-			if (resolver == null) {
+			synchronized (this.methodResolverCache) {
-				resolver = new PortletHandlerMethodResolver(handlerClass);
+				resolver = this.methodResolverCache.get(handlerClass);
-				this.methodResolverCache.put(handlerClass, resolver);
+				if (resolver == null) {
+					resolver = new PortletHandlerMethodResolver(handlerClass);
+					this.methodResolverCache.put(handlerClass, resolver);
+				}
 			}
-			return resolver;
 		}
+		return resolver;
 	}
 
-
 	/**
 	 * Template method for creating a new PortletRequestDataBinder instance.
 	 * <p>The default implementation creates a standard PortletRequestDataBinder.
@@ -417,9 +420,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 	 * @see PortletRequestDataBinder#bind(javax.portlet.PortletRequest)
 	 * @see PortletRequestDataBinder#convertIfNecessary(Object, Class, MethodParameter)
 	 */
-	protected PortletRequestDataBinder createBinder(
+	protected PortletRequestDataBinder createBinder(PortletRequest request, Object target, String objectName) throws Exception {
-			PortletRequest request, Object target, String objectName) throws Exception {
-
 		return new PortletRequestDataBinder(target, objectName);
 	}
 

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java

@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -103,7 +104,6 @@ import org.springframework.web.bind.support.WebBindingInitializer;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.context.request.RequestScope;
 import org.springframework.web.context.request.ServletWebRequest;
-import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.multipart.MultipartRequest;
 import org.springframework.web.servlet.HandlerAdapter;
 import org.springframework.web.servlet.HandlerMapping;
@@ -183,7 +183,8 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 
 	private BeanExpressionContext expressionContext;
 
-	private final Map<Class<?>, ServletHandlerMethodResolver> methodResolverCache = new ConcurrentHashMap<Class<?>, ServletHandlerMethodResolver>();
+	private final Map<Class<?>, ServletHandlerMethodResolver> methodResolverCache =
+			new ConcurrentHashMap<Class<?>, ServletHandlerMethodResolver>();
 
 	private final Map<Class<?>, Boolean> sessionAnnotatedClassesCache = new ConcurrentHashMap<Class<?>, Boolean>();
 
@@ -393,12 +394,11 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 			throws Exception {
 
 		Class<?> clazz = ClassUtils.getUserClass(handler);
-		Boolean annotated = sessionAnnotatedClassesCache.get(clazz);
+		Boolean annotated = this.sessionAnnotatedClassesCache.get(clazz);
 
 		if (annotated == null) {
-			annotated = Boolean.valueOf(AnnotationUtils.findAnnotation(handler
+			annotated = (AnnotationUtils.findAnnotation(handler.getClass(), SessionAttributes.class) != null);
-					.getClass(), SessionAttributes.class) != null);
+			this.sessionAnnotatedClassesCache.put(clazz, annotated);
-			sessionAnnotatedClassesCache.put(clazz, annotated);
 		}
 
 		if (annotated) {
@@ -442,29 +442,34 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 	}
 
 	/**
-	 * This method always returns -1 since an annotated controller can have many methods, each
+	 * This method always returns -1 since an annotated controller can have many methods,
-	 * requiring separate lastModified calculations. Instead an @{@link RequestMapping} method 
+	 * each requiring separate lastModified calculations. Instead, an
-	 * can calculate the lastModified value, call {@link WebRequest#checkNotModified(long)} to
+	 * @{@link RequestMapping}-annotated method can calculate the lastModified value, call
-	 * check it, and return {@code null} if that returns {@code true}.
+	 * {@link org.springframework.web.context.request.WebRequest#checkNotModified(long)}
-	 * @see WebRequest#checkNotModified(long)
+	 * to check it, and return {@code null} if that returns {@code true}.
+	 * @see org.springframework.web.context.request.WebRequest#checkNotModified(long)
 	 */
 	public long getLastModified(HttpServletRequest request, Object handler) {
 		return -1;
 	}
 
+
 	/**
 	 * Build a HandlerMethodResolver for the given handler type.
 	 */
 	private ServletHandlerMethodResolver getMethodResolver(Object handler) {
 		Class handlerClass = ClassUtils.getUserClass(handler);
-		synchronized (this.methodResolverCache) {
+		ServletHandlerMethodResolver resolver = this.methodResolverCache.get(handlerClass);
-			ServletHandlerMethodResolver resolver = this.methodResolverCache.get(handlerClass);
+		if (resolver == null) {
-			if (resolver == null) {
+			synchronized (this.methodResolverCache) {
-				resolver = new ServletHandlerMethodResolver(handlerClass);
+				resolver = this.methodResolverCache.get(handlerClass);
-				this.methodResolverCache.put(handlerClass, resolver);
+				if (resolver == null) {
+					resolver = new ServletHandlerMethodResolver(handlerClass);
+					this.methodResolverCache.put(handlerClass, resolver);
+				}
 			}
-			return resolver;
 		}
+		return resolver;
 	}
 
 
@@ -481,8 +486,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 	 * @see ServletRequestDataBinder#bind(javax.servlet.ServletRequest)
 	 * @see ServletRequestDataBinder#convertIfNecessary(Object, Class, org.springframework.core.MethodParameter) 
 	 */
-	protected ServletRequestDataBinder createBinder(HttpServletRequest request, Object target, String objectName)
+	protected ServletRequestDataBinder createBinder(HttpServletRequest request, Object target, String objectName) throws Exception {
-			throws Exception {
 		return new ServletRequestDataBinder(target, objectName);
 	}
 
@@ -516,7 +520,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 	 */
 	private class ServletHandlerMethodResolver extends HandlerMethodResolver {
 
-		private final Map<Method, RequestMappingInfo> mappings = new ConcurrentHashMap<Method, RequestMappingInfo>();
+		private final Map<Method, RequestMappingInfo> mappings = new HashMap<Method, RequestMappingInfo>();
 
 		private ServletHandlerMethodResolver(Class<?> handlerType) {
 			init(handlerType);