Mercurial > hg > release > icedtea-web-1.3

changeset 199:9c89214b7ef6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix concurrent access problem to downloadOptions.
author Denis Lila <dlila@redhat.com>
date Tue, 05 Apr 2011 12:39:14 -0400
parents 62011060e7ea
children eea730466b87
files ChangeLog netx/net/sourceforge/jnlp/cache/ResourceTracker.java
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Apr 05 12:07:10 2011 -0400
+++ b/ChangeLog	Tue Apr 05 12:39:14 2011 -0400
@@ -1,3 +1,9 @@
+2011-04-05  Denis Lila  <dlila@redhat.com>
+
+	* netx/net/sourceforge/jnlp/cache/ResourceTracker.java:
+	Remove unused imports, add import.
+	(downloadOptions): Make ConcurrentHashMap.
+
 2011-04-05  Denis Lila  <dlila@redhat.com>
 
 	* plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java	Tue Apr 05 12:07:10 2011 -0400
+++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java	Tue Apr 05 12:39:14 2011 -0400
@@ -29,9 +29,8 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Pack200;
 import java.util.jar.Pack200.Unpacker;
@@ -120,8 +119,8 @@
     /** resources requested to be downloaded */
     private static ArrayList<Resource> queue = new ArrayList<Resource>();
 
-    private static Map<Resource, DownloadOptions> downloadOptions =
-        new HashMap<Resource, DownloadOptions>();
+    private static ConcurrentHashMap<Resource, DownloadOptions> downloadOptions =
+        new ConcurrentHashMap<Resource, DownloadOptions>();
 
     /** resource trackers threads are working for (used for load balancing across multi-tracker downloads) */
     private static ArrayList<ResourceTracker> active =