Updated ComputeRealRange to detect when start and end are in the same…

… window, and to handle the edge case where start is exactly the last valid date/time before the window.
bchavez · Apr 1, 2021 · 50b2b1f · 50b2b1f
1 parent 4660f9c
commit 50b2b1f
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/Source/Bogus/DataSets/Date.cs b/Source/Bogus/DataSets/Date.cs
@@ -178,12 +178,20 @@ private void ComputeRealRange(ref DateTime start, ref DateTime end)
 #if !NETSTANDARD1_3
          var window = GetForwardDSTTransitionWindow(start);
 
-         if ((start > window.Start) && (start <= window.End))
-            start = new DateTime(window.End.Ticks, start.Kind);
+         if ((start >= window.Start) && (start <= window.End))
+         {
+            if ((start == window.Start) && (end >= window.Start) && (end <= window.End))
+               end = start;
+            else
+               start = new DateTime(window.End.Ticks, start.Kind);
+
+            if (start == end)
+               return;
+         }
 
          window = GetForwardDSTTransitionWindow(end);
 
-         if ((end >= window.Start) && (end < window.End))
+         if ((end >= window.Start) && (end <= window.End))
             end = new DateTime(window.Start.Ticks, end.Kind);
 
          if (start > end)