Index: src/java/org/quartz/SimpleTrigger.java
===================================================================
--- src/java/org/quartz/SimpleTrigger.java	(revision 656)
+++ src/java/org/quartz/SimpleTrigger.java	(working copy)
@@ -595,7 +595,10 @@
             if(nextFireTime != null && nextFireTime.before(now)) {
                 long diff = now.getTime() - nextFireTime.getTime();
                 if(diff >= misfireThreshold) {
-                    nextFireTime = getFireTimeAfter(nextFireTime);
+                    while (nextFireTime != null && calendar != null
+                            && !calendar.isTimeIncluded(nextFireTime.getTime())) {
+                        nextFireTime = getFireTimeAfter(nextFireTime);
+                    }
                     continue;
                 }
             }