Revision: 1121
http://stripes.svn.sourceforge.net/stripes/?rev=1121&view=rev
Author: bengunter
Date: 2009-03-26 04:10:31 +0000 (Thu, 26 Mar 2009)
Log Message:
-----------
Applied fix for STS-671 from trunk.
Modified Paths:
--------------
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/DispatcherHelper.java
Modified:
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/DispatcherHelper.java
===================================================================
---
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/DispatcherHelper.java
2009-03-26 04:06:23 UTC (rev 1120)
+++
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/DispatcherHelper.java
2009-03-26 04:10:31 UTC (rev 1121)
@@ -108,6 +108,15 @@
ActionBean bean =
StripesFilter.getConfiguration().getActionResolver().getActionBean(context);
ctx.setActionBean(bean);
+ // Prefer the context from the resolved bean if it differs
from the ExecutionContext
+ if (context != bean.getContext()) {
+ ActionBeanContext other = bean.getContext();
+ other.setEventName(context.getEventName());
+
+ context = other;
+ ctx.setActionBeanContext(context);
+ }
+
// Then register it in the Request as THE ActionBean for this
request
HttpServletRequest request = context.getRequest();
request.setAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN,
bean);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
