Fix for 1185 receive timeout in async await actor

akkadotnet · Aug 10, 2015 · 6474bd7 · 6474bd7
1 parent aa45d71
commit 6474bd7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/core/Akka.Tests/Dispatch/AsyncAwaitSpec.cs b/src/core/Akka.Tests/Dispatch/AsyncAwaitSpec.cs
@@ -13,6 +13,24 @@
 
 namespace Akka.Tests.Dispatch
 {
+    class ReceiveTimeoutAsyncActor : ReceiveActor
+    {
+        private IActorRef _replyTo;
+        public ReceiveTimeoutAsyncActor()
+        {
+            Receive<ReceiveTimeout>(t =>
+            {
+                _replyTo.Tell("GotIt");
+            });
+            Receive<string>(async s =>
+            {
+                _replyTo = Sender;
+                
+                await Task.Delay(TimeSpan.FromMilliseconds(100));
+                SetReceiveTimeout(TimeSpan.FromMilliseconds(100));
+            });
+        }
+    }
     class AsyncActor : ReceiveActor
     {
         public AsyncActor()
@@ -325,6 +343,16 @@ public async Task Actor_should_be_able_to_resume_suspend()
             var res = await asker.Ask<string>("stop", TimeSpan.FromSeconds(5));
             res.ShouldBe("done");
         }
+
+
+        [Fact]
+        public void Actor_should_be_able_to_ReceiveTimeout_after_async_operation()
+        {
+            var actor = Sys.ActorOf<ReceiveTimeoutAsyncActor>();
+
+            actor.Tell("hello");
+            ExpectMsg<string>(m => m == "GotIt");
+        }
     }
 }
 
diff --git a/src/core/Akka/Dispatch/ActorTaskScheduler.cs b/src/core/Akka/Dispatch/ActorTaskScheduler.cs
@@ -128,6 +128,7 @@ await action()
 
                 //if mailbox was suspended, make sure we re-enable message processing again
                 mailbox.Resume(MailboxSuspendStatus.AwaitingTask);
+                context.CheckReceiveTimeout();
             },
                 Outer,
                 CancellationToken.None,