[gatein-commits] gatein SVN: r5166 - portal/branches/branch-GTNPORTAL-1643/component/resources/src/main/java/org/exoplatform/services/resources/impl.

[do-not-reply at jboss.org]

Author: ndkhoiits
Date: 2010-11-18 22:05:25 -0500 (Thu, 18 Nov 2010)
New Revision: 5166

Modified:
   portal/branches/branch-GTNPORTAL-1643/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java
Log:
GTNPORTAL-1665 Revert all commit at r at 1521

Modified: portal/branches/branch-GTNPORTAL-1643/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java	2010-11-19 02:49:56 UTC (rev 5165)
+++ portal/branches/branch-GTNPORTAL-1643/component/resources/src/main/java/org/exoplatform/services/resources/impl/BaseResourceBundleService.java	2010-11-19 03:05:25 UTC (rev 5166)
@@ -22,7 +22,6 @@
 import org.exoplatform.commons.utils.IOUtil;
 import org.exoplatform.commons.utils.MapResourceBundle;
 import org.exoplatform.commons.utils.PageList;
-import org.exoplatform.commons.utils.PropertyManager;
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.services.cache.ExoCache;
 import org.exoplatform.services.log.Log;
@@ -384,6 +383,11 @@
          return IdentityResourceBundle.getInstance();
       }
 
+      // Case 1: ResourceBundle of portlets, standard java API is used
+      if (isClasspathResource(name))
+         return ResourceBundleLoader.load(name, locale, cl);
+
+      // Case 2: ResourceBundle of portal
       String country = locale.getCountry();
       String id;
       if (country != null && country.length() > 0)
@@ -407,17 +411,6 @@
       {
       }
 
-      // Case 1: ResourceBundle of portlets, standard java API is used
-      if (isClasspathResource(name))
-      {
-         ResourceBundle res = ResourceBundleLoader.load(name, locale, cl);         
-         //Cache the classpath resource bundle if portal is running in non-developing mode
-         if(!PropertyManager.isDevelopping())
-          cache_.put(id, res);
-         return res;
-      }
-
-      // Case 2: ResourceBundle of portal
       try
       {
          ResourceBundle res = null;