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

* commit 'd7bc5569409e9aef9ed1e4cbf8586b2489359363':
  无JIRA任务 打包失败，job未初始化

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

@@ -1202,10 +1202,6 @@ public abstract class JobStoreSupport implements JobStore, Constants {
             if (job == null) {
                 try {
                     job = retrieveJob(conn, newTrigger.getJobKey());
-                } catch (JobPersistenceException e) {
-                    getLog().error(e.getMessage());
-                }
-            }
                     if (job == null) {
                         throw new JobPersistenceException("The job ("
                                 + newTrigger.getJobKey()
@@ -1221,6 +1217,10 @@ 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);
@@ -2987,6 +2987,7 @@ public abstract class JobStoreSupport implements JobStore, Constants {
             } catch (SQLException sqle) {
                 getLog().error("Unable to set trigger state to ERROR.", sqle);
             }
+            return null;
         }
 
         if (trigger.getCalendarName() != null) {