Revision: 352
Author:   tfenne
Date:     2006-07-31 15:49:45 -0700 (Mon, 31 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/stripes/?rev=352&view=rev

Log Message:
-----------
Fix for STS-229: ActionBean request attribute not set correctly when rendering 
multiple <jsp:includes> of ActionBeans

Modified Paths:
--------------
    trunk/stripes/src/net/sourceforge/stripes/controller/DispatcherServlet.java
Modified: 
trunk/stripes/src/net/sourceforge/stripes/controller/DispatcherServlet.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/controller/DispatcherServlet.java 
2006-07-31 12:16:08 UTC (rev 351)
+++ trunk/stripes/src/net/sourceforge/stripes/controller/DispatcherServlet.java 
2006-07-31 22:49:45 UTC (rev 352)
@@ -253,7 +253,7 @@
      */
     protected void restoreActionBean(HttpServletRequest request) {
         Stack stack = getActionBeanStack(request, false);
-        if (stack != null) {
+        if (stack != null && !stack.empty()) {
             request.setAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN, 
stack.pop());
         }
     }


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development

Reply via email to