Merge pull request #843 from rogeralsing/async-await-resume-mailbox-h…

…otfix Hotfix async await when awaiting IO completion port based tasks
akkadotnet · Apr 13, 2015 · 10b8fd7 · 10b8fd7
2 parents dbf84d8 + 386ed86
commit 10b8fd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/Akka.Tests/Dispatch/AsyncAwaitSpec.cs b/src/core/Akka.Tests/Dispatch/AsyncAwaitSpec.cs
@@ -19,9 +19,10 @@ class AsyncActor : ReceiveActor
     {
         public AsyncActor()
         {
-            Receive<string>(AsyncBehavior.Suspend, async s =>
+            Receive<string>( async s =>
             {
                 await Task.Yield();
+                await Task.Delay(TimeSpan.FromMilliseconds(100));
                 if (s == "stop")
                 {
                     Sender.Tell("done");
@@ -345,7 +346,7 @@ public async Task Actor_should_be_able_to_resume_suspend()
                 asker.Tell("msg #" + i);
             }
 
-            var res = await asker.Ask<string>("stop", TimeSpan.FromSeconds(55555));
+            var res = await asker.Ask<string>("stop", TimeSpan.FromSeconds(5));
             res.ShouldBe("done");
         }
     }

diff --git a/src/core/Akka/Dispatch/ActorTaskScheduler.cs b/src/core/Akka/Dispatch/ActorTaskScheduler.cs
@@ -65,6 +65,7 @@ protected override void QueueTask(Task task)
 
             s.Self.Tell(new CompleteTask(s, () =>
             {
+                SetCurrentState(s.Self,s.Sender,s.Message);
                 TryExecuteTask(task);
                 if (task.IsFaulted)
                     Rethrow(task, null);