s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch to ConcurrentHashMap for jobs table to allow multiple accessors

Browse Source
This commit is contained in:
Tom Morris 2013-07-25 15:36:54 -04:00
parent 0ff2d7ed9f
commit dc206e1889
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/com/google/refine/importing/ImportingManager.java
View File

@ -44,6 +44,7 @@ import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.json.JSONException; import org.json.JSONException;
@ -82,7 +83,7 @@ public class ImportingManager {
static private RefineServlet servlet; static private RefineServlet servlet;
static private File importDir; static private File importDir;
final static private Map<Long, ImportingJob> jobs = new HashMap<Long, ImportingJob>(); final static private Map<Long, ImportingJob> jobs = new ConcurrentHashMap<Long, ImportingJob>();
// Mapping from format to label, e.g., "text" to "Text files", "text/xml" to "XML files" // Mapping from format to label, e.g., "text" to "Text files", "text/xml" to "XML files"
final static public Map<String, Format> formatToRecord = new HashMap<String, Format>(); final static public Map<String, Format> formatToRecord = new HashMap<String, Format>();
@ -288,12 +289,11 @@ public class ImportingManager {
static private void cleanUpStaleJobs() { static private void cleanUpStaleJobs() {
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
for (Long id : new HashSet<Long>(jobs.keySet())) { for (Long id : jobs.keySet()) {
ImportingJob job = jobs.get(id); ImportingJob job = jobs.get(id);
if (job != null && !job.updating && now - job.lastTouched > s_stalePeriod) { if (job != null && !job.updating && now - job.lastTouched > s_stalePeriod) {
job.dispose(); job.dispose();
jobs.remove(id); jobs.remove(id);
logger.info("Disposed " + id); logger.info("Disposed " + id);
} }
} }