Fix concurrent access problem to downloadOptions.

2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index dcbb83b..755b304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-04-05  Denis Lila  <[email protected]>
 
+	* netx/net/sourceforge/jnlp/cache/ResourceTracker.java:
+	Remove unused imports, add import.
+	(downloadOptions): Make ConcurrentHashMap.
+
+2011-04-05  Denis Lila  <[email protected]>
+
 	* plugin/icedteanp/IcedTeaNPPlugin.cc
 	(plugin_start_appletviewer): Replace hardcoded indices
 	with a variable; roll up free calls in a loop; fix whitespace;
diff --git a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java
index 4ef0e0d..c42cc99 100644
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java
+++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java
@@ -29,9 +29,8 @@ import java.net.MalformedURLException;
 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 @@ public class ResourceTracker {
     /** 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 =