From abd628ea09897c511d9353fc948be6734e75e77a Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Wed, 11 Apr 2012 17:49:35 +0000 Subject: [PATCH] WW-3442 adds additional initialisation of HttpSession git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1324893 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/struts2/StrutsTestCase.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java b/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java index d52a0dd6a..9a15729e9 100644 --- a/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java +++ b/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java @@ -36,6 +36,7 @@ import org.apache.struts2.util.StrutsTestCaseHelper; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; +import org.springframework.mock.web.MockHttpSession; import org.springframework.mock.web.MockPageContext; import org.springframework.mock.web.MockServletContext; @@ -159,9 +160,9 @@ public abstract class StrutsTestCase extends XWorkTestCase { } protected void initSession(ActionContext actionContext) { - Map session = actionContext.getSession(); - if (session == null) { + if (actionContext.getSession() == null) { actionContext.setSession(new HashMap()); + request.setSession(new MockHttpSession(servletContext)); } }