extended synchronization for methodResolverCache (SPR-7525)

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

@@ -29,7 +29,6 @@ import java.util.LinkedHashMap;
 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,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 	private BeanExpressionContext expressionContext;
 
 	private final Map<Class<?>, PortletHandlerMethodResolver> methodResolverCache =
-			new ConcurrentHashMap<Class<?>, PortletHandlerMethodResolver>();
+			new HashMap<Class<?>, PortletHandlerMethodResolver>();
 
 
 	/**
@@ -393,6 +392,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 	 */
 	private PortletHandlerMethodResolver getMethodResolver(Object handler) {
 		Class handlerClass = ClassUtils.getUserClass(handler);
+		synchronized (this.methodResolverCache) {
 			PortletHandlerMethodResolver resolver = this.methodResolverCache.get(handlerClass);
 			if (resolver == null) {
 				resolver = new PortletHandlerMethodResolver(handlerClass);
@@ -400,6 +400,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 			}
 			return resolver;
 		}
+	}
 
 
 	/**

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

@@ -34,7 +34,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -184,7 +183,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 	private BeanExpressionContext expressionContext;
 
 	private final Map<Class<?>, ServletHandlerMethodResolver> methodResolverCache =
-			new ConcurrentHashMap<Class<?>, ServletHandlerMethodResolver>();
+			new HashMap<Class<?>, ServletHandlerMethodResolver>();
 
 
 	public AnnotationMethodHandlerAdapter() {
@@ -194,7 +193,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 		// See SPR-7316
 		StringHttpMessageConverter stringHttpMessageConverter = new StringHttpMessageConverter();
 		stringHttpMessageConverter.setWriteAcceptCharset(false);
-		messageConverters = new HttpMessageConverter[]{new ByteArrayHttpMessageConverter(), stringHttpMessageConverter,
+		this.messageConverters = new HttpMessageConverter[]{new ByteArrayHttpMessageConverter(), stringHttpMessageConverter,
 				new SourceHttpMessageConverter(), new XmlAwareFormHttpMessageConverter()};
 	}
 
@@ -440,6 +439,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 	 */
 	private ServletHandlerMethodResolver getMethodResolver(Object handler) {
 		Class handlerClass = ClassUtils.getUserClass(handler);
+		synchronized (this.methodResolverCache) {
 			ServletHandlerMethodResolver resolver = this.methodResolverCache.get(handlerClass);
 			if (resolver == null) {
 				resolver = new ServletHandlerMethodResolver(handlerClass);
@@ -447,6 +447,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 			}
 			return resolver;
 		}
+	}
 
 
 	/**