[seam-commits] Seam SVN: r11998 - branches/community/Seam_2_2/src/main/org/jboss/seam/core.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2010-01-28 10:13:41 -0500 (Thu, 28 Jan 2010)
New Revision: 11998

Modified:
   branches/community/Seam_2_2/src/main/org/jboss/seam/core/ResourceLoader.java
Log:
JBSEAM-4325

Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/core/ResourceLoader.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/core/ResourceLoader.java	2010-01-28 02:47:51 UTC (rev 11997)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/core/ResourceLoader.java	2010-01-28 15:13:41 UTC (rev 11998)
@@ -76,6 +76,15 @@
                Locale.instance(), 
                Thread.currentThread().getContextClassLoader() 
          );
+         
+         // for getting bundle from page level message properties
+         if (bundle == null){
+            bundle = java.util.ResourceBundle.getBundle( 
+                  bundleName, 
+                  Locale.instance(), 
+                  ServletLifecycle.getCurrentServletContext().getClass().getClassLoader() 
+            );
+         }
          log.debug("loaded resource bundle: " + bundleName);
          return bundle;
       }