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

Job id duplicate fix

Browse Source 
Changed how job id's are created to avoid the same id to be assigned to
two concurrent jobs.
This commit is contained in:
Frank Wennerdahl 2014-02-05 12:21:02 +01:00
parent ae56e98522
commit a0d4eb0058
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,10 @@ public class ImportingManager {
static private RefineServlet servlet;
static private File importDir;
final static private Map<Long, ImportingJob> jobs = Collections.synchronizedMap(new HashMap<Long, ImportingJob>());
static private long jobIdCounter = 0;
final static private Object jobIdLock = new Object();
// 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>();
@ -187,7 +190,18 @@ public class ImportingManager {
}
static public ImportingJob createJob() {
long id = System.currentTimeMillis() + (long) (Math.random() * 1000000);
long id;
synchronized(jobIdLock) {
++jobIdCounter;
// Avoid negative job id's when the counter wraps around.
if (jobIdCounter < 0)
jobIdCounter = 1;
id = jobIdCounter;
}
File jobDir = new File(getImportDir(), Long.toString(id));
ImportingJob job = new ImportingJob(id, jobDir);