[gatein-commits] gatein SVN: r5056 - epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/config.

[do-not-reply at jboss.org]

Author: thomas.heute at jboss.com
Date: 2010-11-12 03:17:30 -0500 (Fri, 12 Nov 2010)
New Revision: 5056

Modified:
   epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/config/Component.java
Log:
JBEPP-459: NullPointerException in BreadcumbsPortlet during performance test


Modified: epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/config/Component.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/config/Component.java	2010-11-12 08:04:49 UTC (rev 5055)
+++ epp/portal/branches/EPP_5_1_Branch/webui/framework/src/main/java/org/exoplatform/webui/config/Component.java	2010-11-12 08:17:30 UTC (rev 5056)
@@ -176,21 +176,33 @@
 
    public Event getUIComponentEventConfig(String eventName) throws Exception
    {
-      if (eventMap != null)
+      if(eventMap == null)
       {
-         return eventMap.get(eventName);
+         synchronized(this)
+         {
+            if(eventMap == null)
+            {
+               eventMap = new HashMap<String, Event>();
+
+               if (events == null)
+               {
+                  return null;
+               }
+
+               for (Event event : events)
+               {
+                  createCachedEventListeners(event);
+                  eventMap.put(event.getName(), event);
+               }
+            }
+            
+            return eventMap.get(eventName);
+         }
       }
-      eventMap = new HashMap<String, Event>();
-      if (events == null)
+      else
       {
-         return null;
+         return eventMap.get(eventName);
       }
-      for (Event event : events)
-      {
-         createCachedEventListeners(event);
-         eventMap.put(event.getName(), event);
-      }
-      return eventMap.get(eventName);
    }
 
    public List<EventListener> getUIComponentEventListeners(String eventName) throws Exception