Author: niallp
Date: Mon Aug 29 17:11:09 2005
New Revision: 264662
URL: http://svn.apache.org/viewcvs?rev=264662&view=rev
Log:
Port fix for Bug 35833 to 1.2 Branch
Modified:
struts/core/branches/STRUTS_1_2_BRANCH/src/share/org/apache/struts/taglib/html/MessagesTag.java
Modified:
struts/core/branches/STRUTS_1_2_BRANCH/src/share/org/apache/struts/taglib/html/MessagesTag.java
URL:
http://svn.apache.org/viewcvs/struts/core/branches/STRUTS_1_2_BRANCH/src/share/org/apache/struts/taglib/html/MessagesTag.java?rev=264662&r1=264661&r2=264662&view=diff
==============================================================================
---
struts/core/branches/STRUTS_1_2_BRANCH/src/share/org/apache/struts/taglib/html/MessagesTag.java
(original)
+++
struts/core/branches/STRUTS_1_2_BRANCH/src/share/org/apache/struts/taglib/html/MessagesTag.java
Mon Aug 29 17:11:09 2005
@@ -251,13 +251,17 @@
// Decide whether to iterate or quit
if (iterator.hasNext()) {
ActionMessage report = (ActionMessage) iterator.next();
- String msg =
- TagUtils.getInstance().message(
+ String msg = null;
+ if (report.isResource()) {
+ msg = TagUtils.getInstance().message(
pageContext,
bundle,
locale,
report.getKey(),
report.getValues());
+ } else {
+ msg = report.getKey();
+ }
if (msg == null) {
pageContext.removeAttribute(id);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
