You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hr...@apache.org on 2005/07/10 06:00:07 UTC
svn commit: r209987 - in /struts/core/trunk/src/share/org/apache/struts:
action/Action.java action/RequestProcessor.java
chain/commands/servlet/CreateAction.java
Author: hrabago
Date: Sat Jul 9 21:00:05 2005
New Revision: 209987
URL: http://svn.apache.org/viewcvs?rev=209987&view=rev
Log:
Declare Action's servlet variable as transient.
Modified:
struts/core/trunk/src/share/org/apache/struts/action/Action.java
struts/core/trunk/src/share/org/apache/struts/action/RequestProcessor.java
struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/CreateAction.java
Modified: struts/core/trunk/src/share/org/apache/struts/action/Action.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/Action.java?rev=209987&r1=209986&r2=209987&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/Action.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/Action.java Sat Jul 9 21:00:05 2005
@@ -93,7 +93,7 @@
/**
* <p>The servlet to which we are attached.</p>
*/
- protected ActionServlet servlet = null;
+ protected transient ActionServlet servlet = null;
// ------------------------------------------------------------- Properties
Modified: struts/core/trunk/src/share/org/apache/struts/action/RequestProcessor.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/RequestProcessor.java?rev=209987&r1=209986&r2=209987&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/RequestProcessor.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/RequestProcessor.java Sat Jul 9 21:00:05 2005
@@ -296,8 +296,11 @@
return (null);
}
- instance.setServlet(this.servlet);
actions.put(className, instance);
+ }
+
+ if (instance.getServlet() == null) {
+ instance.setServlet(this.servlet);
}
return (instance);
Modified: struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/CreateAction.java
URL: http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/CreateAction.java?rev=209987&r1=209986&r2=209987&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/CreateAction.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/chain/commands/servlet/CreateAction.java Sat Jul 9 21:00:05 2005
@@ -65,13 +65,15 @@
if (action == null) {
log.info("Initialize action of type: " + type);
action = (Action) ClassUtils.getApplicationInstance(type);
- ServletActionContext saContext = (ServletActionContext) context;
- ActionServlet actionServlet = saContext.getActionServlet();
- action.setServlet(actionServlet);
actions.put(type, action);
}
}
+ if (action.getServlet() == null) {
+ ServletActionContext saContext = (ServletActionContext) context;
+ ActionServlet actionServlet = saContext.getActionServlet();
+ action.setServlet(actionServlet);
+ }
return (action);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org