dgraham 2003/06/14 11:36:20
Modified: src/share/org/apache/struts/util RequestUtils.java
Log:
Added boolean checkPageScope parameter to retrieveMessageResources()
for PR# 20750.
Revision Changes Path
1.103 +17 -14
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.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- RequestUtils.java 17 May 2003 01:56:51 -0000 1.102
+++ RequestUtils.java 14 Jun 2003 18:36:19 -0000 1.103
@@ -980,7 +980,7 @@
throws JspException {
MessageResources resources =
- retrieveMessageResources(pageContext, bundle);
+ retrieveMessageResources(pageContext, bundle, false);
Locale userLocale = retrieveUserLocale(pageContext, locale);
@@ -1005,10 +1005,11 @@
* @FIXME The bundle name needs the module prefix appended to it before
searching
* to fix PR# 11932.
*/
- private static MessageResources retrieveMessageResources(
- PageContext pageContext,
- String bundle)
- throws JspException {
+ private static MessageResources retrieveMessageResources(
+ PageContext pageContext,
+ String bundle,
+ boolean checkPageScope)
+ throws JspException {
MessageResources resources = null;
@@ -1016,10 +1017,12 @@
bundle = Globals.MESSAGES_KEY;
}
- resources =
- (MessageResources) pageContext.getAttribute(
- bundle,
- PageContext.PAGE_SCOPE);
+ if (checkPageScope) {
+ resources =
+ (MessageResources) pageContext.getAttribute(
+ bundle,
+ PageContext.PAGE_SCOPE);
+ }
if (resources == null) {
resources =
@@ -1342,7 +1345,7 @@
throws JspException {
MessageResources resources =
- retrieveMessageResources(pageContext, bundle);
+ retrieveMessageResources(pageContext, bundle, true);
Locale userLocale = retrieveUserLocale(pageContext, locale);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
