summaryrefslogtreecommitdiff
path: root/apscheduler/triggers/cron/expressions.py
diff options
context:
space:
mode:
authorAlex Grönholm <alex.gronholm@nextday.fi>2015-12-09 19:52:43 +0200
committerAlex Grönholm <alex.gronholm@nextday.fi>2015-12-09 19:54:21 +0200
commit46e186faa93b28bfe7054b8ee436a416b08135f5 (patch)
treef873193467f9b1363a4c62f91296bb9bfe88b6d8 /apscheduler/triggers/cron/expressions.py
parentf30bc0769faedf98e5874f93d454dc41900fefeb (diff)
downloadapscheduler-46e186faa93b28bfe7054b8ee436a416b08135f5.tar.gz
Fixed infinite loop in the cron trigger if an expression only contained values out of range of the target field (fixes #105)
Diffstat (limited to 'apscheduler/triggers/cron/expressions.py')
-rw-r--r--apscheduler/triggers/cron/expressions.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/apscheduler/triggers/cron/expressions.py b/apscheduler/triggers/cron/expressions.py
index 55272db..69565ba 100644
--- a/apscheduler/triggers/cron/expressions.py
+++ b/apscheduler/triggers/cron/expressions.py
@@ -67,7 +67,7 @@ class RangeExpression(AllExpression):
maxval = field.get_max(date)
# Apply range limits
- minval = max(minval, self.first)
+ minval = min(maxval, max(minval, self.first))
if self.last is not None:
maxval = min(maxval, self.last)
start = max(start, minval)