1. opensymphony
  2. xwork

Commits

jcarreira  committed 362de02

- Change to DefaultActionProxy to make it go back to always cleaning up after ActionContext ThreadLocal and properly nest ActionContexts -> If this breaks Portlet stuff we'll have to figure something out

- Adding Tree control tag

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

  • Participants
  • Parent commits 772ef45
  • Branches master

Comments (0)

Files changed (2)

File XWork.iml

View file
     <option name="ACTIVE_VCS_NAME" value="CVS" />
     <option name="USE_PROJECT_VCS" value="false" />
   </component>
+  <component name="copyright">
+    <Base>
+      <setting name="state" value="1" />
+    </Base>
+    <JavaOptions>
+      <option name="body" value="/*&#10; * Copyright (c) $today.year Opensymphony. All Rights Reserved.&#10; */" />
+      <option name="location" value="1" />
+      <option name="remove" value="true" />
+      <option name="replace" value="2" />
+    </JavaOptions>
+  </component>
 </module>
 

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

View file
         ActionContext nestedContext = null;
 
         String executed = ActionGlobalContext.getContext().getActionExecuted();
-        if (executed != null) {
+//        if (executed != null) {
             nestedContext = ActionContext.getContext();
-        }
+//        }
 
         ActionContext.setContext(invocation.getInvocationContext());
 
             retCode = invocation.invoke();
             ActionGlobalContext.getContext().setActionExecuted("Executed");
         } finally {
-            if (cleanupContext && executed != null) {
+//            if (cleanupContext && executed != null) {
+            if (cleanupContext) {
                 ActionContext.setContext(nestedContext);
             }
         }