Merge pull request #1261 from ohksj77/handle-mifired-trigger-exceptio…

…n-2.4.x Handle exceptions thrown while retrieving the misfired trigger
quartz-scheduler · Nov 12, 2024 · 47e6cec · 47e6cec
2 parents fe1b374 + 175941d
commit 47e6cec
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/quartz/src/main/java/org/quartz/impl/jdbcjobstore/JobStoreSupport.java b/quartz/src/main/java/org/quartz/impl/jdbcjobstore/JobStoreSupport.java
@@ -970,16 +970,26 @@ conn, STATE_WAITING, getMisfireTime(),
         }
 
         for (TriggerKey triggerKey: misfiredTriggers) {
-
-            OperableTrigger trig = 
-                retrieveTrigger(conn, triggerKey);
 
-            if (trig == null) {
+            OperableTrigger trig;
+
+            try {
+                trig = retrieveTrigger(conn, triggerKey);
+            } catch (Exception e) {
+                getLog().error("Error retrieving the misfired trigger: {}", triggerKey, e);
                 continue;
             }
 
-            doUpdateOfMisfiredTrigger(conn, trig, false, STATE_WAITING, recovering);
+            if (trig == null) {
+                continue;
+            }
 
+            try {
+                doUpdateOfMisfiredTrigger(conn, trig, false, STATE_WAITING, recovering);
+            } catch (Exception e) {
+                getLog().error("Error updating misfired trigger: {}", trig.getKey(), e);
+                continue;
+            }
             if(trig.getNextFireTime() != null && trig.getNextFireTime().getTime() < earliestNewTime)
                 earliestNewTime = trig.getNextFireTime().getTime();
         }