|
@@ -341,12 +341,12 @@ ErrorCodeEnum CReportMgrFSM::StartPoll()
|
|
|
|
|
|
if(((CUpgradeMgrEntity*)m_pEntity)->m_IsSM3listSucc==1){
|
|
|
//hash文件计算成功
|
|
|
- Dbg("SM3 Hash compute succ ,sendPoll with hash");
|
|
|
+ Dbg("SM3 Hash compute succ, sendPoll with hash");
|
|
|
m_pConnection->SendPollUpgradeReq(true);
|
|
|
return Error_Succeed;
|
|
|
}else if(((CUpgradeMgrEntity*)m_pEntity)->m_IsSM3listSucc==-1){
|
|
|
//hash文件计算失败
|
|
|
- Dbg("SM3 Hash compute fail ,sendPoll with null");
|
|
|
+ Dbg("SM3 Hash compute fail, sendPoll with null");
|
|
|
m_pConnection->SendPollUpgradeReq(false);
|
|
|
return Error_Succeed;
|
|
|
}else if(((CUpgradeMgrEntity*)m_pEntity)->m_IsSM3listSucc==0){
|
|
@@ -354,7 +354,7 @@ ErrorCodeEnum CReportMgrFSM::StartPoll()
|
|
|
DWORD elapseTime = CSmallDateTime::GetNow()-((CUpgradeMgrEntity*)m_pEntity)->m_beginSM3HashTime;
|
|
|
if(elapseTime>60*10){
|
|
|
//发送空
|
|
|
- Dbg("SM3 Hash compute is timeout,sendPoll with null");
|
|
|
+ Dbg("SM3 Hash compute is timeout, sendPoll with null");
|
|
|
((CUpgradeMgrEntity*)m_pEntity)->m_beginSM3HashTime=-1;//超时完成,设置为计算失败
|
|
|
m_pConnection->SendPollUpgradeReq(false);
|
|
|
return Error_Succeed;
|