lukaszlenart commented on a change in pull request #397: URL: https://github.com/apache/struts/pull/397#discussion_r416350023
########## File path: core/src/main/java/org/apache/struts2/interceptor/ScopeInterceptor.java ########## @@ -271,18 +271,18 @@ protected void after(ActionInvocation invocation, String result) throws Exceptio protected void before(ActionInvocation invocation) throws Exception { invocation.addPreResultListener(this); - Map ses = ActionContext.getContext().getSession(); - if (ses == null && autoCreateSession) { - ses = new SessionMap(ServletActionContext.getRequest()); - ActionContext.getContext().setSession(ses); + Map<String, Object> session = ActionContext.getContext().getSession(); + if (session == null && autoCreateSession) { + session = new SessionMap<>(ServletActionContext.getRequest()); + ActionContext.getContext().withSession(session); } - if ( ses != null) { - lock(ses, invocation); + if ( session != null) { + lock(session, invocation); } String key = getKey(invocation); - Map app = ActionContext.getContext().getApplication(); + Map<String, Object> app = ActionContext.getContext().getApplication(); Review comment: 👍 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org