Commits

Anonymous committed b98080b

XW-97: Made resetting of ActionContext happen inside a finally block

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk/src@73e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits f1ef97b

Comments (0)

Files changed (1)

File java/com/opensymphony/xwork/DefaultActionProxy.java

         ActionContext.setContext(invocation.getInvocationContext());
 
         String retCode = null;
-        retCode = invocation.invoke();
 
-        // save the context before overwriting it
-        lastContext = ActionContext.getContext();
-        ActionContext.setContext(nestedContext);
+        try {
+            retCode = invocation.invoke();
+        } finally {
+            ActionContext.setContext(nestedContext);
+        }
 
         return retCode;
     }