Revision: 1199
http://stripes.svn.sourceforge.net/stripes/?rev=1199&view=rev
Author: bengunter
Date: 2009-10-27 19:11:59 +0000 (Tue, 27 Oct 2009)
Log Message:
-----------
Rolled up 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-10-27 19:01:08 UTC (rev 1198)
+++
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/DispatcherHelper.java
2009-10-27 19:11:59 UTC (rev 1199)
@@ -119,6 +119,17 @@
ctx.setActionBeanContext(context);
}
+ // 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());
+ other.setRequest(context.getRequest());
+ other.setResponse(context.getResponse());
+
+ 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.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
