Solves WW-3582 - moves in call to handleValidToken() method outside of lock on session object

lukaszlenart · lukaszlenart · commit f713cfc8372d · 2011-03-01T06:54:13.000Z
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1075679 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/TokenInterceptor.java
@@ -140,9 +140,8 @@ protected String doIntercept(ActionInvocation invocation) throws Exception {
             if (!TokenHelper.validToken()) {
                 return handleInvalidToken(invocation);
             }
-
-            return handleValidToken(invocation);
         }
+        return handleValidToken(invocation);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -140,9 +140,8 @@ protected String doIntercept(ActionInvocation invocation) throws Exception {`
`140`	`140`	`if (!TokenHelper.validToken()) {`
`141`	`141`	`return handleInvalidToken(invocation);`
`142`	`142`	`}`
`143`		`-`
`144`		`- return handleValidToken(invocation);`
`145`	`143`	`}`
	`144`	`+ return handleValidToken(invocation);`
`146`	`145`	`}`
`147`	`146`
`148`	`147`	`/**`