added Math.Max(1, *) to preven the devide by zero exception in issue #48

fluentcassandra · Aug 21, 2012 · efd5d8c · efd5d8c
1 parent 27b16f3
commit efd5d8c
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/System/DateTimePrecise.cs b/src/System/DateTimePrecise.cs
@@ -72,24 +72,19 @@ public DateTime GetUtcNow()
 			if (stopWatchTicks < immutable.ObservedTicks + _synchronizePeriodStopwatchTicks)
 			{
 				return immutable.BaseTime.AddTicks(((
-					stopWatchTicks - immutable.ObservedTicks) * ClockTickFrequency) / (
+					stopWatchTicks - immutable.ObservedTicks) * ClockTickFrequency) / (immutable.StopWatchFrequency));
-						immutable.StopWatchFrequency));
 			}
 			else
 			{
 				var utc = DateTime.UtcNow;
 
-				DateTime tBaseNew = immutable.BaseTime.AddTicks(((
+				DateTime tBaseNew = immutable.BaseTime.AddTicks(((stopWatchTicks - immutable.ObservedTicks) * ClockTickFrequency) / (immutable.StopWatchFrequency));
-					stopWatchTicks - immutable.ObservedTicks) * ClockTickFrequency) / (
-						immutable.StopWatchFrequency));
 
 				_immutable = new DateTimePreciseSafeImmutable(
 					utc,
 					tBaseNew,
 					stopWatchTicks,
-					  ((stopWatchTicks - immutable.ObservedTicks) * ClockTickFrequency * 2) /
+					((stopWatchTicks - immutable.ObservedTicks) * ClockTickFrequency * 2) / (3 * utc.Ticks - 2 * immutable.ObservedTime.Ticks - tBaseNew.Ticks));
-					  (utc.Ticks - immutable.ObservedTime.Ticks + utc.Ticks +
-					   utc.Ticks - tBaseNew.Ticks - immutable.ObservedTime.Ticks));
 
 				return tBaseNew;
 			}
@@ -113,14 +108,14 @@ public DateTimeOffset GetNowOffset()
 			return new DateTimeOffset(GetNow());
 		}
 
-		private sealed class DateTimePreciseSafeImmutable
+		private sealed struct DateTimePreciseSafeImmutable
 		{
 			public DateTimePreciseSafeImmutable(DateTime observedTime, DateTime baseTime, long observedTicks, long stopWatchFrequency)
 			{
 				ObservedTime = observedTime;
 				BaseTime = baseTime;
 				ObservedTicks = observedTicks;
-				StopWatchFrequency = stopWatchFrequency;
+				StopWatchFrequency = Math.Max(1, stopWatchFrequency);
 			}
 
 			public readonly DateTime ObservedTime;