/hg/icedtea-web: Fix useless thread group creation.

[dlila at icedtea.classpath.org]

changeset c4a58969d117 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c4a58969d117
author: Denis Lila <dlila at redhat.com>
date: Tue May 03 09:14:16 2011 -0400

	Fix useless thread group creation.


diffstat:

 ChangeLog                                |  10 ++++++++++
 netx/net/sourceforge/jnlp/NetxPanel.java |  19 ++++++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 6fe7281c17b7 -r c4a58969d117 ChangeLog
--- a/ChangeLog	Mon May 02 14:33:32 2011 -0400
+++ b/ChangeLog	Tue May 03 09:14:16 2011 -0400
@@ -1,3 +1,13 @@
+2011-05-03  Denis Lila  <dlila at redhat.com>
+
+	* 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 <dbhole at redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
diff -r 6fe7281c17b7 -r c4a58969d117 netx/net/sourceforge/jnlp/NetxPanel.java
--- a/netx/net/sourceforge/jnlp/NetxPanel.java	Mon May 02 14:33:32 2011 -0400
+++ b/netx/net/sourceforge/jnlp/NetxPanel.java	Tue May 03 09:14:16 2011 -0400
@@ -27,7 +27,9 @@
 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 @@
 
     // 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 @@
 
         // 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 ThreadGroup getThreadGroup() {
-        return uKeyToTG.get(uKey);
+        synchronized(TGMapMutex) {
+            return uKeyToTG.get(uKey);
+        }
     }
 
     public void createNewAppContext() {