Merge pull request #1195 from Aaronontheweb/1194-fix

fixed #1194 (ThrottleTransportAdapter overflow bug)
akkadotnet · Aug 3, 2015 · e6ca2ac · e6ca2ac
2 parents fb4dbca + 42de92c
commit e6ca2ac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/.nuget/NuGet.exe b/src/.nuget/NuGet.exe
diff --git a/src/core/Akka.Remote.Tests/Transport/ThrottleModeSpec.cs b/src/core/Akka.Remote.Tests/Transport/ThrottleModeSpec.cs
@@ -8,13 +8,14 @@
 using System;
 using Akka.Remote.Transport;
 using Akka.TestKit;
+using Akka.Util;
 using Xunit;
 
 namespace Akka.Remote.Tests.Transport
 {
     public class ThrottleModeSpec : AkkaSpec
     {
-        static readonly long HalfSecond = TimeSpan.FromSeconds(0.5).Ticks;
+        static readonly long HalfSecond = TimeSpan.FromSeconds(0.5).Ticks.ToNanos();
 
         [Fact]
         public void ThrottleMode_must_allow_consumption_of_infinite_amount_of_tokens_when_unthrottled()

diff --git a/src/core/Akka.Remote/Transport/ThrottleTransportAdapter.cs b/src/core/Akka.Remote/Transport/ThrottleTransportAdapter.cs
@@ -552,7 +552,9 @@ public override TimeSpan TimeToAvailable(long currentNanoTime, int tokens)
 
         int TokensGenerated(long nanoTimeOfSend)
         {
-            return Convert.ToInt32(((double)(nanoTimeOfSend - _nanoTimeOfLastSend) / TimeSpan.TicksPerMillisecond) * _tokensPerSecond / 1000);
+            var milliSecondsSinceLastSend = ((nanoTimeOfSend - _nanoTimeOfLastSend).ToTicks()/TimeSpan.TicksPerMillisecond);
+            var tokensGenerated = milliSecondsSinceLastSend*_tokensPerSecond/1000;
+            return Convert.ToInt32(tokensGenerated);
         }
 
         TokenBucket Copy(int? capacity = null, double? tokensPerSecond = null, long? nanoTimeOfLastSend = null, int? availableTokens = null)