Revision: 1374
http://stripes.svn.sourceforge.net/stripes/?rev=1374&view=rev
Author: bengunter
Date: 2010-12-29 17:42:53 +0000 (Wed, 29 Dec 2010)
Log Message:
-----------
Fixed STS-789: SimpleMessage calling MessageFormat with replacement parameters
when there are none. For compatibility with JSTL, a MessageFormat is used only
if replacement parameters are supplied.
Modified Paths:
--------------
branches/1.5.x/stripes/src/net/sourceforge/stripes/action/SimpleMessage.java
Modified:
branches/1.5.x/stripes/src/net/sourceforge/stripes/action/SimpleMessage.java
===================================================================
---
branches/1.5.x/stripes/src/net/sourceforge/stripes/action/SimpleMessage.java
2010-12-28 23:29:04 UTC (rev 1373)
+++
branches/1.5.x/stripes/src/net/sourceforge/stripes/action/SimpleMessage.java
2010-12-29 17:42:53 UTC (rev 1374)
@@ -14,9 +14,9 @@
*/
package net.sourceforge.stripes.action;
+import java.text.MessageFormat;
+import java.util.Arrays;
import java.util.Locale;
-import java.util.Arrays;
-import java.text.MessageFormat;
/**
* <p>A simple non-error message that uses the String supplied to it as the
message (i.e. it does
@@ -89,8 +89,15 @@
public String getMessage(Locale locale) {
// Now get the message itself
String messageTemplate = getMessageTemplate(locale);
- MessageFormat format = new MessageFormat(messageTemplate, locale);
- return format.format(this.replacementParameters, new StringBuffer(),
null).toString();
+
+ // For compatibility with JSTL, only apply formatting if there are
replacement parameters
+ if (this.replacementParameters != null &&
this.replacementParameters.length > 0) {
+ MessageFormat format = new MessageFormat(messageTemplate, locale);
+ return format.format(this.replacementParameters, new
StringBuffer(), null).toString();
+ }
+ else {
+ return messageTemplate;
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
