[gatein-commits] gatein SVN: r5157 - exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/application.

[do-not-reply at jboss.org]

Author: hoang_to
Date: 2010-11-18 06:22:08 -0500 (Thu, 18 Nov 2010)
New Revision: 5157

Modified:
   exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/application/ConfigurationManager.java
Log:
EXOGTN-129: Apply updated patch

Modified: exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/application/ConfigurationManager.java
===================================================================
--- exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/application/ConfigurationManager.java	2010-11-18 10:48:25 UTC (rev 5156)
+++ exo/portal/branches/3.1.x/webui/core/src/main/java/org/exoplatform/webui/application/ConfigurationManager.java	2010-11-18 11:22:08 UTC (rev 5157)
@@ -19,6 +19,14 @@
 
 package org.exoplatform.webui.application;
 
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.exoplatform.webui.config.Component;
 import org.exoplatform.webui.config.ComponentHandle;
 import org.exoplatform.webui.config.Event;
@@ -40,14 +48,6 @@
 import org.jibx.runtime.IBindingFactory;
 import org.jibx.runtime.IUnmarshallingContext;
 
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * May 10, 2006
  * <p/>
@@ -57,7 +57,7 @@
  */
 public class ConfigurationManager
 {
-   private volatile Map<String, Component> configs_ = new HashMap<String, Component>();
+   private final Map<String, Component> configs_ = new ConcurrentHashMap<String, Component>();
 
    /** The logger. */
    private final Logger log;
@@ -108,14 +108,12 @@
     *
     * @param configs An array of Component
     */
-   synchronized void setComponentConfigs(Component[] configs)
+   void setComponentConfigs(Component[] configs)
    {
-      Map<String, Component> tmpConfigs = new HashMap<String, Component>(configs_);
       for (Component component : configs)
       {
-         tmpConfigs.put(component.getKey(), component);
+         configs_.put(component.getKey(), component);
       }
-      this.configs_ = tmpConfigs;
    }
 
    /**