Skip to content

Commit 6099419

Browse files
authored
Fix for #141 (#142)
* Fix for #141
1 parent dca776d commit 6099419

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

MFiles.VAF.Extensions.Tests/Configuration/ScheduledExecution/DailyTriggerTests.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,19 @@ TimeZoneInfo timezoneInfo
3030
}.GetNextExecution(after, timezoneInfo);
3131
Assert.AreEqual(expected?.ToUniversalTime(), execution?.ToUniversalTime());
3232
}
33+
[TestMethod]
34+
public void NullAfterDoesNotThrow
35+
(
36+
)
37+
{
38+
var execution = new DailyTrigger()
39+
{
40+
TriggerTimes = new List<TimeSpan>
41+
{
42+
new TimeSpan(10, 0, 0)
43+
}
44+
}.GetNextExecution(null);
45+
}
3346

3447
public static IEnumerable<object[]> GetNextExecutionData()
3548
{

MFiles.VAF.Extensions/Configuration/ScheduledExecution/DailyTrigger.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public DailyTrigger()
5959
timeZoneInfo = timeZoneInfo ?? TimeZoneInfo.Local;
6060

6161
// When should we start looking?
62-
var before = after.Value;
63-
after = (after ?? DateTime.UtcNow).ToUniversalTime();
62+
var before = (after ?? DateTime.UtcNow);
63+
after = before.ToUniversalTime();
6464

6565
// Convert the time into the timezone we're after.
6666
after = TimeZoneInfo.ConvertTime(after.Value, timeZoneInfo);

MFiles.VAF.Extensions/Configuration/ScheduledExecution/Schedule.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ public class Schedule
108108
// Get the next execution date from the triggers.
109109
var next = this.Triggers?
110110
.Select(t => t.GetNextExecution(after, timeZoneInfo))
111-
.Where(d => d.HasValue && d.Value.DateTime != DateTime.MinValue)
111+
.Where(d => d.HasValue)
112+
.Where(d => d.Value.DateTime != DateTime.MinValue)
112113
.OrderBy(d => d);
113114
return next.Any() ? next.First() : null;
114115
}

0 commit comments

Comments
 (0)