commit 7cf0adbe1268c5007574e270756611fd5292d465
author Nathan Bubna <nbubna@apache.org> Fri Jun 20 23:09:02 2008 +0000
committer Nathan Bubna <nbubna@apache.org> Fri Jun 20 23:09:02 2008 +0000
tree 42b0b44067e58b1926e00ba4b43753e116a3bb24
parent 57c9258f737316f9fff0ffeb58bcc6aa04106963

getMessageResource(req,app) should check req for resources before checking app (VELTOOLS-105)

git-svn-id: https://svn.apache.org/repos/asf/velocity/tools/branches/1.x@670092 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/velocity/tools/struts/StrutsUtils.java

diff --git a/src/java/org/apache/velocity/tools/struts/StrutsUtils.java b/src/java/org/apache/velocity/tools/struts/StrutsUtils.java
index 75f977c..b1f5f45 100644
--- a/src/java/org/apache/velocity/tools/struts/StrutsUtils.java
+++ b/src/java/org/apache/velocity/tools/struts/StrutsUtils.java
@@ -74,10 +74,7 @@
     public static MessageResources getMessageResources(HttpServletRequest request,
                                                        ServletContext app)
     {
-        /* Identify the current module */
-        ModuleConfig moduleConfig = ModuleUtils.getInstance().getModuleConfig(request, app);
-        return (MessageResources)app.getAttribute(Globals.MESSAGES_KEY +
-                                                  moduleConfig.getPrefix());
+        return getMessageResources(request, app, null);
     }
 
 
@@ -94,23 +91,20 @@
                                                        ServletContext app,
                                                        String bundle)
     {
-        MessageResources resources = null;
-
         /* Identify the current module */
         ModuleConfig moduleConfig = ModuleUtils.getInstance().getModuleConfig(request, app);
 
-
         if (bundle == null) {
             bundle = Globals.MESSAGES_KEY;
         }
 
         // First check request scope
-        resources = (MessageResources) request.getAttribute(bundle + moduleConfig.getPrefix());
+        MessageResources resources =
+            (MessageResources)request.getAttribute(bundle + moduleConfig.getPrefix());
 
         if (resources == null) {
             resources = (MessageResources) app.getAttribute(bundle + moduleConfig.getPrefix());
         }
-
         return resources;
     }