Revision: 417
http://svn.sourceforge.net/stripes/?rev=417&view=rev
Author: tfenne
Date: 2006-09-25 19:36:42 -0700 (Mon, 25 Sep 2006)
Log Message:
-----------
Reverting part of the "fix" for STS-276 which caused regressions.
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-09-26 02:30:23 UTC (rev 416)
+++ trunk/stripes/src/net/sourceforge/stripes/controller/DispatcherServlet.java
2006-09-26 02:36:42 UTC (rev 417)
@@ -303,14 +303,15 @@
/**
* Restores the previous value of the 'actionBean' attribute in the
request. If no
- * ActionBeans have been saved using [EMAIL PROTECTED]
#saveActionBean(HttpServletRequest)} then
- * this revertst the 'actionBean' to null.
+ * ActionBeans have been saved using [EMAIL PROTECTED]
#saveActionBean(HttpServletRequest)} then this
+ * method has no effect.
*
* @param request the current HttpServletRequest
*/
protected void restoreActionBean(HttpServletRequest request) {
Stack stack = getActionBeanStack(request, false);
- Object previous = (stack != null && !stack.empty()) ? stack.pop() :
null;
- request.setAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN, previous);
+ if (stack != null && !stack.empty()) {
+ request.setAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN,
stack.pop());
+ }
}
}
\ No newline at end of file
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
