Author: nbubna
Date: Fri Oct 14 16:14:23 2005
New Revision: 321241
URL: http://svn.apache.org/viewcvs?rev=321241&view=rev
Log:
check session (if any) for ActionMessages as well as the request (patch from
Erik Engstrom for Issue VELTOOLS-1)
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsUtils.java
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsUtils.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsUtils.java?rev=321241&r1=321240&r2=321241&view=diff
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsUtils.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/struts/StrutsUtils.java
Fri Oct 14 16:14:23 2005
@@ -194,14 +194,30 @@
/**
* Returns the Struts messages for this request or <code>null</code>
- * if none exist.
+ * if none exist. Since VelocityTools 1.2, this will also check
+ * the session for messages (if there is a session).
*
* @param request the servlet request
* @since VelocityTools 1.1
*/
public static ActionMessages getMessages(HttpServletRequest request)
{
- return (ActionMessages)request.getAttribute(Globals.MESSAGE_KEY);
+ ActionMessages messages = new ActionMessages();
+ HttpSession session = request.getSession(false);
+ if (session != null)
+ {
+ ActionMessages sessionMessages =
+ (ActionMessages)session.getAttribute(Globals.MESSAGE_KEY);
+ if (sessionMessages != null) {
+ messages.add(sessionMessages);
+ }
+ }
+ ActionMessages requestMessages =
+ (ActionMessages)request.getAttribute(Globals.MESSAGE_KEY);
+ if (requestMessages != null) {
+ messages.add(requestMessages);
+ }
+ return messages;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
