Revision: 1445
          http://stripes.svn.sourceforge.net/stripes/?rev=1445&view=rev
Author:   bengunter
Date:     2011-12-01 21:02:15 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Fixed STS-844. Reverted r1199 because it applied a patch that had already been 
applied, resulting in duplicate code.

Revision Links:
--------------
    http://stripes.svn.sourceforge.net/stripes/?rev=1199&view=rev

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
 2011-12-01 20:46:56 UTC (rev 1444)
+++ 
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/DispatcherHelper.java
 2011-12-01 21:02:15 UTC (rev 1445)
@@ -119,17 +119,6 @@
                     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.


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure 
contains a definitive record of customers, application performance, 
security threats, fraudulent activity, and more. Splunk takes this 
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development

Reply via email to