Merge pull request #147 from lirizhong97/mq30_dev

fix to avoid coredump while application exit
This commit is contained in:
ruanshudong 2021-03-23 22:36:18 +08:00 committed by GitHub
commit f8b8fa17b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View File

@ -518,7 +518,7 @@ void Communicator::terminate()
}
// 释放当前线程数据
ServantProxyThreadData::reset();
// ServantProxyThreadData::reset();
//把锁释放掉, 再来等待线程停止, 避免死锁
//因为通信器线程运行过程中, 有可能加上上面那把锁

View File

@ -404,6 +404,7 @@ void QueryEpBase::refreshReg(GetEndpointType type, const string & sName)
case E_STATION:
{
iRet = _queryFPrx->findObjectByIdInSameStation(_objName,sName,activeEp,inactiveEp, ServerConfig::Context);
break;
}
case E_SET:
{