summaryrefslogtreecommitdiff
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 20:20:49 +0200
commit8335573d5692656bca5e5e5177e8aab169ed868a (patch)
tree0088f106bc5d2f2d2019db2493ac76e0ad166a1d
parentc7ffa733c9b23c4605b75f092a794446fa3abdf4 (diff)
downloadapscheduler-8335573d5692656bca5e5e5177e8aab169ed868a.tar.gz
Fixed infinite loop in the cron trigger if an expression only contained values out of range of the target field (fixes #105)
-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)