fixed bug regarding synchronous & asynchronous timeouts (Issue 42)

actor-framework · Jul 27, 2012 · 84bb540 · 84bb540
1 parent d33d5b2
commit 84bb540
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/cppa/detail/receive_policy.hpp b/cppa/detail/receive_policy.hpp
@@ -341,7 +341,9 @@ class receive_policy {
                 handle_timeout(client, fun);
                 if (awaited_response.valid()) {
                     client->mark_arrived(awaited_response);
+                    client->remove_handler(awaited_response);
                 }
+                hm_cleanup(client, policy);
                 return hm_msg_handled;
             }
             case sync_response: {
@@ -355,9 +357,9 @@ class receive_policy {
 #                   else
                     fun(node->msg);
 #                   endif
-                    hm_cleanup(client, policy);
                     client->mark_arrived(awaited_response);
                     client->remove_handler(awaited_response);
+                    hm_cleanup(client, policy);
                     return hm_msg_handled;
                 }
                 return hm_cache_msg;