[struts] 05/05: WW-4789 WW-3788 Adjusts after rebase

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch action-context-boost
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 81b069b3f1f6b1049fbb7497928cdc791c6a95b6
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sun Apr 5 07:45:55 2020 +0200

    WW-4789 WW-3788 Adjusts after rebase
---
 .../src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java
 
b/plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java
index 1e7ea61..56d7cb0 100644
--- 
a/plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java
+++ 
b/plugins/portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java
@@ -134,12 +134,12 @@ public abstract class StrutsTestCasePortletTests extends 
XWorkTestCase {
         initSession(actionContext);
         applyAdditionalParams(actionContext);
         // set the action context to the one used by the proxy
-        ActionContext.setContext(actionContext);
+        ActionContext.bind(actionContext);
     }
 
     protected void initSession(ActionContext actionContext) {
         if (actionContext.getSession() == null) {
-            actionContext.setSession(new HashMap<String, Object>());
+            actionContext.setSession(new HashMap<>());
             request.setSession(new MockHttpSession(servletContext));
         }
     }