diff --git a/ZoomPipeline_FuncSvr/cluster/zp_clusternode.cpp b/ZoomPipeline_FuncSvr/cluster/zp_clusternode.cpp index 6537a48f0f35f7ec485a44f5097efc7625c70aea..31df35cdb30feedda6aef61db906fad0ff4dec25 100644 --- a/ZoomPipeline_FuncSvr/cluster/zp_clusternode.cpp +++ b/ZoomPipeline_FuncSvr/cluster/zp_clusternode.cpp @@ -1,5 +1,6 @@ #include "zp_clusternode.h" #include "zp_clusterterm.h" +#include namespace ZP_Cluster{ zp_ClusterNode::zp_ClusterNode(zp_ClusterTerm * pTerm, QObject * psock,QObject *parent) : ZPTaskEngine::zp_plTaskBase(parent) @@ -56,6 +57,8 @@ namespace ZP_Cluster{ //qDebug()<1) + return -1; int nCurrSz = -1; int nMessage = m_nMessageBlockSize; while (--nMessage>=0 && nCurrSz!=0 ) @@ -71,7 +74,10 @@ namespace ZP_Cluster{ if (m_currentReadOffset >= block.size()) { m_mutex_rawData.lock(); - m_list_RawData.pop_front(); + if (m_list_RawData.empty()==false) + m_list_RawData.pop_front(); + else + assert(false); m_currentReadOffset = 0; m_mutex_rawData.unlock(); } diff --git a/ZoomPipeline_FuncSvr/smartlink/st_clientnode_basetrans.cpp b/ZoomPipeline_FuncSvr/smartlink/st_clientnode_basetrans.cpp index 57c0d364ff17776820d307c831bdc7479e90efff..ba9aac8f0e6c461c36ad0594e0850b66791c86a9 100644 --- a/ZoomPipeline_FuncSvr/smartlink/st_clientnode_basetrans.cpp +++ b/ZoomPipeline_FuncSvr/smartlink/st_clientnode_basetrans.cpp @@ -1,5 +1,6 @@ #include "st_clientnode_basetrans.h" #include "st_client_table.h" +#include namespace ExampleServer{ st_clientNode_baseTrans::st_clientNode_baseTrans(st_client_table * pClientTable, QObject * pClientSock ,QObject *parent) : zp_plTaskBase(parent) @@ -48,6 +49,8 @@ namespace ExampleServer{ //qDebug()<1) + return -1; int nCurrSz = -1; int nMessage = m_nMessageBlockSize; while (--nMessage>=0 && nCurrSz!=0 ) @@ -63,7 +66,10 @@ namespace ExampleServer{ if (m_currentReadOffset >= block.size()) { m_mutex_rawData.lock(); - m_list_RawData.pop_front(); + if (m_list_RawData.empty()==false) + m_list_RawData.pop_front(); + else + assert(false); m_currentReadOffset = 0; m_mutex_rawData.unlock(); }