fix release bug

xiuxi · Jun 2, 2017 · e73d0c8 · e73d0c8
1 parent 26d7614
commit e73d0c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mars/stn/src/net_core.cc b/mars/stn/src/net_core.cc
@@ -240,8 +240,8 @@ NetCore::~NetCore() {
 
 void NetCore::__Release(NetCore* _instance) {
 
-    if (MessageQueue::CurrentThreadMessageQueue() != MessageQueue::Handler2Queue(_instance->asyncreg_.Get())) {
-        WaitMessage(AsyncInvoke((MessageQueue::AsyncInvokeFunction)boost::bind(&NetCore::__Release, _instance), _instance->asyncreg_.Get()));
+    if (MessageQueue::CurrentThreadMessageQueue() == MessageQueue::Handler2Queue(_instance->asyncreg_.Get())) {
+        AsyncInvoke((MessageQueue::AsyncInvokeFunction)boost::bind(&NetCore::__Release, _instance), MessageQueue::DefAsyncInvokeHandler(MessageQueue::GetDefMessageQueue()));
         return;
     }
 

diff --git a/mars/stn/src/net_core.h b/mars/stn/src/net_core.h
@@ -58,7 +58,7 @@ enum {
 
 class NetCore {
   public:
-    SINGLETON_INTRUSIVE(NetCore, new NetCore, delete);
+    SINGLETON_INTRUSIVE(NetCore, new NetCore, __Release);
 
   public:
     boost::function<void (Task& _task)> task_process_hook_;