Ver código fonte

任务线程移除Jetty依赖,为后续RPC模块拆分做准备;

xuxueli 7 anos atrás
pai
commit
f246cf2fa3

+ 5 - 3
xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java Ver arquivo

8
 import com.xxl.job.core.log.XxlJobFileAppender;
8
 import com.xxl.job.core.log.XxlJobFileAppender;
9
 import com.xxl.job.core.log.XxlJobLogger;
9
 import com.xxl.job.core.log.XxlJobLogger;
10
 import com.xxl.job.core.util.ShardingUtil;
10
 import com.xxl.job.core.util.ShardingUtil;
11
-import org.eclipse.jetty.util.ConcurrentHashSet;
12
 import org.slf4j.Logger;
11
 import org.slf4j.Logger;
13
 import org.slf4j.LoggerFactory;
12
 import org.slf4j.LoggerFactory;
14
 
13
 
15
 import java.io.PrintWriter;
14
 import java.io.PrintWriter;
16
 import java.io.StringWriter;
15
 import java.io.StringWriter;
16
+import java.util.Collections;
17
 import java.util.Date;
17
 import java.util.Date;
18
+import java.util.HashSet;
19
+import java.util.Set;
18
 import java.util.concurrent.LinkedBlockingQueue;
20
 import java.util.concurrent.LinkedBlockingQueue;
19
 import java.util.concurrent.TimeUnit;
21
 import java.util.concurrent.TimeUnit;
20
 
22
 
28
 	private int jobId;
30
 	private int jobId;
29
 	private IJobHandler handler;
31
 	private IJobHandler handler;
30
 	private LinkedBlockingQueue<TriggerParam> triggerQueue;
32
 	private LinkedBlockingQueue<TriggerParam> triggerQueue;
31
-	private ConcurrentHashSet<Integer> triggerLogIdSet;		// avoid repeat trigger for the same TRIGGER_LOG_ID
33
+	private Set<Integer> triggerLogIdSet;		// avoid repeat trigger for the same TRIGGER_LOG_ID
32
 
34
 
33
 	private volatile boolean toStop = false;
35
 	private volatile boolean toStop = false;
34
 	private String stopReason;
36
 	private String stopReason;
41
 		this.jobId = jobId;
43
 		this.jobId = jobId;
42
 		this.handler = handler;
44
 		this.handler = handler;
43
 		this.triggerQueue = new LinkedBlockingQueue<TriggerParam>();
45
 		this.triggerQueue = new LinkedBlockingQueue<TriggerParam>();
44
-		this.triggerLogIdSet = new ConcurrentHashSet<Integer>();
46
+		this.triggerLogIdSet = Collections.synchronizedSet(new HashSet<Integer>());
45
 	}
47
 	}
46
 	public IJobHandler getHandler() {
48
 	public IJobHandler getHandler() {
47
 		return handler;
49
 		return handler;