Commits

jcarreira  committed acbfe4f

Making ActionContext NOT serializable and some cleanups

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

  • Participants
  • Parent commits 9de68b7

Comments (0)

Files changed (3)

File java/com/opensymphony/xwork/ActionContext.java

 
 import com.opensymphony.xwork.util.OgnlValueStack;
 
-import java.io.Serializable;
-
 import java.util.Locale;
 import java.util.Map;
 
  * @author $Author$
  * @version $Revision$
  */
-public class ActionContext implements Serializable {
+public class ActionContext {
     //~ Static fields/initializers /////////////////////////////////////////////
 
     static ThreadLocal actionContext = new ActionContextThreadLocal();

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

     //~ Instance fields ////////////////////////////////////////////////////////
 
     ActionConfig config;
-    ActionContext lastContext;
+    transient ActionContext lastContext;
     ActionInvocation invocation;
     Map extraContext;
     String actionName;
     String namespace;
     boolean executeResult;
-    private ActionContext nestedContext;
+    private transient ActionContext nestedContext;
 
     //~ Constructors ///////////////////////////////////////////////////////////
 
     /**
-    * This constructor is private so the builder methods (create*) should be used to create an DefaultActionProxy.
-    *
-    * The reason for the builder methods is so that you can use a subclass to create your own DefaultActionProxy instance
-    * (like a RMIActionProxy).
-    */
+* This constructor is private so the builder methods (create*) should be used to create an DefaultActionProxy.
+*
+* The reason for the builder methods is so that you can use a subclass to create your own DefaultActionProxy instance
+* (like a RMIActionProxy).
+*/
     protected DefaultActionProxy(String namespace, String actionName, Map extraContext, boolean executeResult) throws Exception {
         if (LOG.isDebugEnabled()) {
             LOG.debug("Creating an DefaultActionProxy for namespace " + namespace + " and action name " + actionName);

File java/com/opensymphony/xwork/util/OgnlValueStack.java

  */
 package com.opensymphony.xwork.util;
 
-import com.opensymphony.xwork.util.CompoundRoot;
-import com.opensymphony.xwork.util.CompoundRootAccessor;
-import com.opensymphony.xwork.util.OgnlUtil;
-
 import ognl.Ognl;
 import ognl.OgnlException;
 import ognl.OgnlRuntime;
 
-import java.io.IOException;
 import java.io.ObjectStreamException;
 import java.io.Serializable;