Fix useless thread group creation.

2 files changed, 24 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 467e82a..6740252 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-03  Denis Lila  <[email protected]>
+
+	* netx/net/sourceforge/jnlp/NetxPanel.java:
+	Add imports.
+	(uKeyToTG): Change to HashMap.
+	(TGMapMutex): New mutex to synchronize uKeyToTG.
+	(getThreadGroup): Synchronize on TGMapMutex.
+	(NetxPanel): Only create a new thread group if one doesn't already
+	exist for the computed uKey.
+
 2011-05-02  Deepak Bhole <[email protected]>
 
 	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
diff --git a/netx/net/sourceforge/jnlp/NetxPanel.java b/netx/net/sourceforge/jnlp/NetxPanel.java
index e8d43cd..59c3ce0 100644
--- a/netx/net/sourceforge/jnlp/NetxPanel.java
+++ b/netx/net/sourceforge/jnlp/NetxPanel.java
@@ -27,7 +27,9 @@ import net.sourceforge.jnlp.runtime.AppletInstance;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 
 import java.net.URL;
+import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -49,8 +51,9 @@ public class NetxPanel extends AppletViewerPanel {
 
     // We use this so that we can create exactly one thread group
     // for all panels with the same uKey.
-    private static final ConcurrentMap<String, ThreadGroup> uKeyToTG =
-        new ConcurrentHashMap<String, ThreadGroup>();
+    private static final Map<String, ThreadGroup> uKeyToTG =
+        new HashMap<String, ThreadGroup>();
+    private static final Object TGMapMutex = new Object();
 
     // This map is actually a set (unfortunately there is no ConcurrentSet
     // in java.util.concurrent). If KEY is in this map, then we know that
@@ -95,8 +98,12 @@ public class NetxPanel extends AppletViewerPanel {
 
         // when this was being done (incorrectly) in Launcher, the call was
         // new AppThreadGroup(mainGroup, file.getTitle());
-        ThreadGroup tg = new ThreadGroup(Launcher.mainGroup, this.documentURL.toString());
-        uKeyToTG.putIfAbsent(this.uKey, tg);
+        synchronized(TGMapMutex) {
+            if (!uKeyToTG.containsKey(this.uKey)) {
+                ThreadGroup tg = new ThreadGroup(Launcher.mainGroup, this.documentURL.toString());
+                uKeyToTG.put(this.uKey, tg);
+            }
+        }
     }
 
     // overloaded constructor, called when initialized via plugin
@@ -210,7 +217,9 @@ public class NetxPanel extends AppletViewerPanel {
     }
 
     public ThreadGroup getThreadGroup() {
-        return uKeyToTG.get(uKey);
+        synchronized(TGMapMutex) {
+            return uKeyToTG.get(uKey);
+        }
     }
 
     public void createNewAppContext() {