Merge pull request #210 in CORE/base-third from ~LANLAN/base-third:final/10.0 to final/10.0

* commit 'ca2e8dbd7e76678d6daa7c55ca7ce29e1d585d46':
  DEC-7569 定时调度模块启动异常

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

@@ -1199,27 +1199,26 @@ public abstract class JobStoreSupport implements JobStore, Constants {
                 }
             }
 
-            if (job == null) {
+            try {
-                try {
+                if (job == null) {
                     job = retrieveJob(conn, newTrigger.getJobKey());
-                    if (job == null) {
+                }
-                        throw new JobPersistenceException("The job ("
+                if (job == null) {
-                                + newTrigger.getJobKey()
+                    throw new JobPersistenceException("The job ("
-                                + ") referenced by the trigger does not exist.");
+                            + newTrigger.getJobKey()
-                    }
+                            + ") referenced by the trigger does not exist.");
-
+                }
-                    if (job.isConcurrentExectionDisallowed() && !recovering) {
+                if (job.isConcurrentExectionDisallowed() && !recovering) {
-                        state = checkBlockedState(conn, job.getKey(), state);
+                    state = checkBlockedState(conn, job.getKey(), state);
-                    }
+                }
 
-                    if (existingTrigger) {
+                if (existingTrigger) {
-                        getDelegate().updateTrigger(conn, newTrigger, state, job);
+                    getDelegate().updateTrigger(conn, newTrigger, state, job);
-                    } else {
+                } else {
-                        getDelegate().insertTrigger(conn, newTrigger, state, job);
+                    getDelegate().insertTrigger(conn, newTrigger, state, job);
-                    }
-                } catch (JobPersistenceException e) {
-                    getLog().error(e.getMessage());
                 }
+            } catch (JobPersistenceException e) {
+                getLog().error(e.getMessage());
             }
         } catch (Exception e) {
             throw new JobPersistenceException("Couldn't store trigger '" + newTrigger.getKey() + "' for '"
@@ -2987,7 +2986,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
             } catch (SQLException sqle) {
                 getLog().error("Unable to set trigger state to ERROR.", sqle);
             }
-            return null;
+            throw jpe;
         }
 
         if (trigger.getCalendarName() != null) {