Merge branch 'master' of https://github.com/xuxueli/xxl-job

xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml

@@ -232,10 +232,12 @@
 		UPDATE xxl_job_info
 		SET
 			trigger_last_time = #{triggerLastTime},
-			trigger_next_time = #{triggerNextTime},
+			trigger_next_time = #{triggerNextTime}
-			trigger_status = #{triggerStatus}
+			<if test="triggerStatus == 0">
+			 , trigger_status = #{triggerStatus}
+			</if>
 		WHERE id = #{id}
 		  AND trigger_status = 1
 	</update>
 
-</mapper>
+</mapper>

xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java

@@ -36,7 +36,7 @@ public class JobThread extends Thread{
 	private String stopReason;
 
     private boolean running = false;    // if running job
-	private int idleTimes = 0;			// idel times
+	private int idleTimes = 0;			// idle times
 
 
 	public JobThread(int jobId, IJobHandler handler) {
@@ -185,7 +185,7 @@ public class JobThread extends Thread{
 				} else {
 					if (idleTimes > 30) {
 						if(triggerQueue.size() == 0) {	// avoid concurrent trigger causes jobId-lost
-							XxlJobExecutor.removeJobThread(jobId, "excutor idel times over limit.");
+							XxlJobExecutor.removeJobThread(jobId, "excutor idle times over limit.");
 						}
 					}
 				}