Author: manaRH Date: 2010-04-23 09:07:16 -0400 (Fri, 23 Apr 2010) New Revision: 12607 Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/core/ResourceLoader.java Log: JBPAPP-4003 Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/core/ResourceLoader.java =================================================================== --- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/core/ResourceLoader.java 2010-04-23 12:58:58 UTC (rev 12606) +++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/core/ResourceLoader.java 2010-04-23 13:07:16 UTC (rev 12607) @@ -76,6 +76,16 @@ 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; }