martinc 2003/02/15 21:29:46
Modified: src/share/org/apache/struts/taglib/html MessagesTag.java
Log:
If RequestUtils.message() returns null, don't call pageContext.setAttribute
(since that is illegal), but call pageContext.removeAttribute instead.
PR: 17016
Submitted by: Nick Afshartous
Revision Changes Path
1.11 +13 -9
jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java
Index: MessagesTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/MessagesTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MessagesTag.java 15 Feb 2003 03:22:59 -0000 1.10
+++ MessagesTag.java 16 Feb 2003 05:29:46 -0000 1.11
@@ -261,12 +261,16 @@
report.getKey(),
report.getValues());
- // log missing key to ease debugging
- if (msg == null && log.isDebugEnabled()) {
- log.debug(messageResources.getMessage("messageTag.resources",
report.getKey()));
- }
+ if (msg != null) {
+ pageContext.setAttribute(id, msg);
+ } else {
+ pageContext.removeAttribute(id);
- pageContext.setAttribute(id, msg);
+ // log missing key to ease debugging
+ if (log.isDebugEnabled()) {
+ log.debug(messageResources.getMessage("messageTag.resources",
report.getKey()));
+ }
+ }
if (header != null && header.length() > 0) {
String headerMessage = RequestUtils.message(pageContext, bundle,
locale, header);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
