Merge pull request #211 in CORE/base-third from final/10.0 to persist/10.0

* commit '33627bc420cb8a29515ee4e18be42b2f6d2cdc85':
  DEC-7569 定时调度模块启动异常
  无JIRA任务 打包失败，job未初始化
  DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler
  DEC-7376 定时调度任务表中存在脏数据的时候，不能影响整个scheduler

fine-quartz/src/com/fr/third/v2/org/quartz/impl/jdbcjobstore/JobStoreSupport.java

@@ -17,38 +17,21 @@
 
 package com.fr.third.v2.org.quartz.impl.jdbcjobstore;
 
-import java.io.IOException;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.fr.third.v2.org.quartz.Calendar;
 import com.fr.third.v2.org.quartz.Job;
+import com.fr.third.v2.org.quartz.JobDataMap;
 import com.fr.third.v2.org.quartz.JobDetail;
+import com.fr.third.v2.org.quartz.JobKey;
+import com.fr.third.v2.org.quartz.JobPersistenceException;
 import com.fr.third.v2.org.quartz.ObjectAlreadyExistsException;
 import com.fr.third.v2.org.quartz.Scheduler;
 import com.fr.third.v2.org.quartz.SchedulerConfigException;
-import com.fr.third.v2.org.quartz.TriggerKey;
-import com.fr.third.v2.org.quartz.spi.OperableTrigger;
-import com.fr.third.v2.org.quartz.spi.ThreadExecutor;
-import com.fr.third.v2.org.quartz.spi.TriggerFiredResult;
-import com.fr.third.v2.org.quartz.JobDataMap;
-import com.fr.third.v2.org.quartz.JobKey;
-import com.fr.third.v2.org.quartz.JobPersistenceException;
 import com.fr.third.v2.org.quartz.SchedulerException;
 import com.fr.third.v2.org.quartz.SimpleTrigger;
 import com.fr.third.v2.org.quartz.Trigger;
 import com.fr.third.v2.org.quartz.Trigger.CompletedExecutionInstruction;
 import com.fr.third.v2.org.quartz.Trigger.TriggerState;
+import com.fr.third.v2.org.quartz.TriggerKey;
 import com.fr.third.v2.org.quartz.impl.DefaultThreadExecutor;
 import com.fr.third.v2.org.quartz.impl.matchers.GroupMatcher;
 import com.fr.third.v2.org.quartz.impl.matchers.StringMatcher;
@@ -56,12 +39,29 @@ import com.fr.third.v2.org.quartz.impl.matchers.StringMatcher.StringOperatorName
 import com.fr.third.v2.org.quartz.impl.triggers.SimpleTriggerImpl;
 import com.fr.third.v2.org.quartz.spi.ClassLoadHelper;
 import com.fr.third.v2.org.quartz.spi.JobStore;
+import com.fr.third.v2.org.quartz.spi.OperableTrigger;
 import com.fr.third.v2.org.quartz.spi.SchedulerSignaler;
+import com.fr.third.v2.org.quartz.spi.ThreadExecutor;
 import com.fr.third.v2.org.quartz.spi.TriggerFiredBundle;
+import com.fr.third.v2.org.quartz.spi.TriggerFiredResult;
 import com.fr.third.v2.org.quartz.utils.DBConnectionManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 
 /**
  * <p>
@@ -354,6 +354,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
     public long getDbRetryInterval() {
         return dbRetryInterval;
     }
+
     /**
      * @param dbRetryInterval The dbRetryInterval to set.
      */
@@ -473,7 +474,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
      * should be performed after obtaining an explicit DB lock.  This is the
      * behavior prior to Quartz 1.6.3, but is considered unnecessary for most
      * databases, and therefore a superfluous performance hit.
-     * 
+     * <p>
      * However, if batch acquisition is used, it is important for this behavior
      * to be used for all dbs.
      */
@@ -488,8 +489,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
      * Set the JDBC driver delegate class.
      * </p>
      *
-     * @param delegateClassName
+     * @param delegateClassName the delegate class name
-     *          the delegate class name
      */
     @SuppressWarnings("UnusedDeclaration") /* called reflectively */
     public void setDriverDelegateClass(String delegateClassName)
@@ -515,8 +515,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
      * Set the JDBC driver delegate's initialization string.
      * </p>
      *
-     * @param delegateInitString
+     * @param delegateInitString the delegate init string
-     *          the delegate init string
      */
     @SuppressWarnings("UnusedDeclaration") /* called reflectively */
     public void setDriverDelegateInitString(String delegateInitString)
@@ -805,7 +804,10 @@ public abstract class JobStoreSupport implements JobStore, Constants {
         } catch (SQLException sqle) {
             getLog().warn("Failed to override connection auto commit/transaction isolation.", sqle);
         } catch (Throwable e) {
-            try { conn.close(); } catch(Throwable ignored) {}
+            try {
+                conn.close();
+            } catch (Throwable ignored) {
+            }
 
             throw new JobPersistenceException(
                     "Failure setting up connection.", e);
@@ -846,8 +848,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
      * appropriate.
      * </p>
      *
-     * @throws JobPersistenceException
+     * @throws JobPersistenceException if jobs could not be recovered
-     *           if jobs could not be recovered
      */
     protected void recoverJobs(Connection conn) throws JobPersistenceException {
         try {
@@ -875,11 +876,15 @@ public abstract class JobStoreSupport implements JobStore, Constants {
                                     + " jobs that were in-progress at the time of the last shut-down.");
 
             for (OperableTrigger recoveringJobTrigger : recoveringJobTriggers) {
+                try {
                     if (jobExists(conn, recoveringJobTrigger.getJobKey())) {
                         recoveringJobTrigger.computeFirstFireTime(null);
                         storeTrigger(conn, recoveringJobTrigger, null, false,
                                 STATE_WAITING, false, true);
                     }
+                } catch (JobPersistenceException e) {
+                    getLog().error(e.getMessage());
+                }
             }
             getLog().info("Recovery complete.");
 
@@ -933,9 +938,11 @@ public abstract class JobStoreSupport implements JobStore, Constants {
         public boolean hasMoreMisfiredTriggers() {
             return _hasMoreMisfiredTriggers;
         }
+
         public int getProcessedMisfiredTriggerCount() {
             return _processedMisfiredTriggerCount;
         }
+
         public long getEarliestNewTime() {
             return _earliestNewTime;
         }
@@ -1044,12 +1051,9 @@ public abstract class JobStoreSupport implements JobStore, Constants {
      * Store the given <code>{@link JobDetail}</code> and <code>{@link Trigger}</code>.
      * </p>
      *
-     * @param newJob
+     * @param newJob     The <code>JobDetail</code> to be stored.
-     *          The <code>JobDetail</code> to be stored.
+     * @param newTrigger The <code>Trigger</code> to be stored.
-     * @param newTrigger
+     * @throws ObjectAlreadyExistsException if a <code>Job</code> with the same name/group already
-     *          The <code>Trigger</code> to be stored.
-     * @throws ObjectAlreadyExistsException
-     *           if a <code>Job</code> with the same name/group already
      *                                      exists.
      */
     public void storeJobAndTrigger(final JobDetail newJob,
@@ -1071,14 +1075,11 @@ public abstract class JobStoreSupport implements JobStore, Constants {
      * Store the given <code>{@link JobDetail}</code>.
      * </p>
      *
-     * @param newJob
+     * @param newJob          The <code>JobDetail</code> to be stored.
-     *          The <code>JobDetail</code> to be stored.
+     * @param replaceExisting If <code>true</code>, any <code>Job</code> existing in the
-     * @param replaceExisting
-     *          If <code>true</code>, any <code>Job</code> existing in the
      *                        <code>JobStore</code> with the same name & group should be
      *                        over-written.
-     * @throws ObjectAlreadyExistsException
+     * @throws ObjectAlreadyExistsException if a <code>Job</code> with the same name/group already
-     *           if a <code>Job</code> with the same name/group already
      *                                      exists, and replaceExisting is set to false.
      */
     public void storeJob(final JobDetail newJob,
@@ -1140,14 +1141,11 @@ public abstract class JobStoreSupport implements JobStore, Constants {
      * Store the given <code>{@link Trigger}</code>.
      * </p>
      *
-     * @param newTrigger
+     * @param newTrigger      The <code>Trigger</code> to be stored.
-     *          The <code>Trigger</code> to be stored.
+     * @param replaceExisting If <code>true</code>, any <code>Trigger</code> existing in
-     * @param replaceExisting
-     *          If <code>true</code>, any <code>Trigger</code> existing in
      *                        the <code>JobStore</code> with the same name & group should
      *                        be over-written.
-     * @throws ObjectAlreadyExistsException
+     * @throws ObjectAlreadyExistsException if a <code>Trigger</code> with the same name/group already
-     *           if a <code>Trigger</code> with the same name/group already
      *                                      exists, and replaceExisting is set to false.
      */
     public void storeTrigger(final OperableTrigger newTrigger,
@@ -1201,6 +1199,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
                 }
             }
 
+            try {
                 if (job == null) {
                     job = retrieveJob(conn, newTrigger.getJobKey());
                 }
@@ -1209,7 +1208,6 @@ public abstract class JobStoreSupport implements JobStore, Constants {
                             + newTrigger.getJobKey()
                             + ") referenced by the trigger does not exist.");
                 }
-
                 if (job.isConcurrentExectionDisallowed() && !recovering) {
                     state = checkBlockedState(conn, job.getKey(), state);
                 }
@@ -1219,6 +1217,9 @@ public abstract class JobStoreSupport implements JobStore, Constants {
                 } else {
                     getDelegate().insertTrigger(conn, newTrigger, state, job);
                 }
+            } catch (JobPersistenceException e) {
+                getLog().error(e.getMessage());
+            }
         } catch (Exception e) {
             throw new JobPersistenceException("Couldn't store trigger '" + newTrigger.getKey() + "' for '"
                     + newTrigger.getJobKey() + "' job:" + e.getMessage(), e);
@@ -1601,16 +1602,12 @@ public abstract class JobStoreSupport implements JobStore, Constants {
      * Store the given <code>{@link Calendar}</code>.
      * </p>
      *
-     * @param calName
+     * @param calName         The name of the calendar.
-     *          The name of the calendar.
+     * @param calendar        The <code>Calendar</code> to be stored.
-     * @param calendar
+     * @param replaceExisting If <code>true</code>, any <code>Calendar</code> existing
-     *          The <code>Calendar</code> to be stored.
-     * @param replaceExisting
-     *          If <code>true</code>, any <code>Calendar</code> existing
      *                        in the <code>JobStore</code> with the same name & group
      *                        should be over-written.
-     * @throws ObjectAlreadyExistsException
+     * @throws ObjectAlreadyExistsException if a <code>Calendar</code> with the same name already
-     *           if a <code>Calendar</code> with the same name already
      *                                      exists, and replaceExisting is set to false.
      */
     public void storeCalendar(final String calName,
@@ -1695,6 +1692,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
      * <code>Trigger</code>s pointing to non-existent calendars, then a
      * <code>JobPersistenceException</code> will be thrown.</p>
      * *
+     *
      * @param calName The name of the <code>Calendar</code> to be removed.
      * @return <code>true</code> if a <code>Calendar</code> with the given name
      * was found and removed from the store.
@@ -1735,8 +1733,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
      * Retrieve the given <code>{@link Trigger}</code>.
      * </p>
      *
-     * @param calName
+     * @param calName The name of the <code>Calendar</code> to be retrieved.
-     *          The name of the <code>Calendar</code> to be retrieved.
      * @return The desired <code>Calendar</code>, or null if there is no
      * match.
      */
@@ -2978,7 +2975,9 @@ public abstract class JobStoreSupport implements JobStore, Constants {
 
         try {
             job = retrieveJob(conn, trigger.getJobKey());
-            if (job == null) { return null; }
+            if (job == null) {
+                return null;
+            }
         } catch (JobPersistenceException jpe) {
             try {
                 getLog().error("Error retrieving job, setting trigger state to ERROR.", jpe);
@@ -2992,7 +2991,9 @@ public abstract class JobStoreSupport implements JobStore, Constants {
 
         if (trigger.getCalendarName() != null) {
             cal = retrieveCalendar(conn, trigger.getCalendarName());
-            if (cal == null) { return null; }
+            if (cal == null) {
+                return null;
+            }
         }
 
         try {
@@ -3225,6 +3226,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
     }
 
     protected ThreadLocal<Long> sigChangeForTxCompletion = new ThreadLocal<Long>();
+
     protected void signalSchedulingChangeOnTxCompletion(long candidateNewNextFireTime) {
         Long sigTime = sigChangeForTxCompletion.get();
         if (sigTime == null && candidateNewNextFireTime >= 0L)