From 64baef9f19cc8d797da6f8757c17771192288ffa Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@gopivotal.com>
Date: Thu, 22 Aug 2013 20:56:26 -0400
Subject: [PATCH] Fix failing tests

Issue: SPR-10825
---
 .../test/web/servlet/setup/StandaloneMockMvcBuilder.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
index 4d4d02a0bd..7794f48c59 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
@@ -318,7 +318,9 @@ public class StandaloneMockMvcBuilder extends DefaultMockMvcBuilder<StandaloneMo
 
 		StandaloneConfiguration config = new StandaloneConfiguration();
 
-		StaticRequestMappingHandlerMapping hm = config.getHandlerMapping(cxt);
+		StaticRequestMappingHandlerMapping hm = config.getHandlerMapping();
+		hm.setServletContext(cxt.getServletContext());
+		hm.setApplicationContext(cxt);
 		hm.registerHandlers(controllers);
 		cxt.addBean("requestMappingHandlerMapping", hm);
 
@@ -358,11 +360,8 @@ public class StandaloneMockMvcBuilder extends DefaultMockMvcBuilder<StandaloneMo
 	private class StandaloneConfiguration extends WebMvcConfigurationSupport {
 
 
-		public StaticRequestMappingHandlerMapping getHandlerMapping(StubWebApplicationContext cxt) {
-
+		public StaticRequestMappingHandlerMapping getHandlerMapping() {
 			StaticRequestMappingHandlerMapping handlerMapping = new StaticRequestMappingHandlerMapping();
-			handlerMapping.setServletContext(cxt.getServletContext());
-			handlerMapping.setApplicationContext(cxt);
 			handlerMapping.setEmbeddedValueResolver(new StaticStringValueResolver(placeHolderValues));
 			handlerMapping.setUseSuffixPatternMatch(useSuffixPatternMatch);
 			handlerMapping.setUseTrailingSlashMatch(useTrailingSlashPatternMatch);
-- 
GitLab