You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by wo...@apache.org on 2010/02/19 15:53:07 UTC

svn commit: r911828 - /portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java

Author: woonsan
Date: Fri Feb 19 14:53:07 2010
New Revision: 911828

URL: http://svn.apache.org/viewvc?rev=911828&view=rev
Log:
Fixing a problem that "bundleCache" for a portlet definition has not been cached correctly.

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java?rev=911828&r1=911827&r2=911828&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java Fri Feb 19 14:53:07 2010
@@ -371,13 +371,14 @@
             Map<String, Map<Locale, ResourceBundle>> portletResourceBundleCache = portletsResourceBundleCache.get(paName);
             if (portletResourceBundleCache == null)
             {
-                portletResourceBundleCache = Collections.synchronizedMap(new HashMap<String, Map<Locale, ResourceBundle>>());
-                portletsResourceBundleCache.put(paName, portletResourceBundleCache);
+                portletsResourceBundleCache.put(paName, Collections.synchronizedMap(new HashMap<String, Map<Locale, ResourceBundle>>()));
+                portletResourceBundleCache = portletsResourceBundleCache.get(paName);
             }
             Map<Locale, ResourceBundle> bundleCache = portletResourceBundleCache.get(pdName);
             if (bundleCache == null)
             {
-                bundleCache = Collections.synchronizedMap(new HashMap<Locale, ResourceBundle>());
+                portletResourceBundleCache.put(pdName, Collections.synchronizedMap(new HashMap<Locale, ResourceBundle>()));
+                bundleCache = portletResourceBundleCache.get(pdName);
             }
             bundle = bundleCache.get(locale);
             if (bundle == null)
@@ -753,5 +754,5 @@
             return false;
         }
     }
-
+    
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org