dgraham 2003/04/02 17:29:03
Modified: src/share/org/apache/struts/util RequestUtils.java
Log:
Fixed braces placement in message() for PR # 18591.
Revision Changes Path
1.96 +8 -6
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- RequestUtils.java 24 Mar 2003 04:39:35 -0000 1.95
+++ RequestUtils.java 3 Apr 2003 01:29:03 -0000 1.96
@@ -967,14 +967,16 @@
// Look up the requested MessageResources
if (bundle == null) {
bundle = Globals.MESSAGES_KEY;
- resources =
+ }
+
+ resources =
(MessageResources) pageContext.getAttribute(bundle,
PageContext.REQUEST_SCOPE);
- }
if (resources == null) {
resources =
(MessageResources) pageContext.getAttribute(bundle,
PageContext.APPLICATION_SCOPE);
}
+
if (resources == null) {
JspException e = new JspException(messages.getMessage("message.bundle",
bundle));
saveException(pageContext, e);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]