浏览代码

Z991239-1308 #comment feat:修改连接其他实体通讯时,释放connect指针问题

Signed-Off-By: commit-hook
刘文涛174520 5 年之前
父节点
当前提交
6d443d963b
共有 2 个文件被更改,包括 13 次插入7 次删除
  1. 11 6
      Module/mod_UpgradeMgr/mod_UpgradeMgr.cpp
  2. 2 1
      Module/mod_UpgradeRun/mod_UpgradeRun.cpp

+ 11 - 6
Module/mod_UpgradeMgr/mod_UpgradeMgr.cpp

@@ -228,11 +228,12 @@ ErrorCodeEnum CUpgradeMgrEntity::DownloadPack(const CSimpleStringA &strPackFile)
 		pClient->GetFunction()->CloseSession();
 	}
 	else
-	{
+	{	
 		Dbg("connect to download entity fail: %d", rc);
+		pClient->SafeDelete();
 	}
 
-	pClient->SafeDelete();
+	//pClient->SafeDelete();
 	return rc;
 }
 
@@ -252,9 +253,10 @@ ErrorCodeEnum CUpgradeMgrEntity::CancelDownloadPack(const CSimpleStringA &strPac
 	else
 	{
 		Dbg("connect to download entity fail: %d", rc);
+		pClient->SafeDelete();
 	}
 
-	pClient->SafeDelete();
+	//pClient->SafeDelete();
 	return rc;
 }
 
@@ -328,8 +330,9 @@ ErrorCodeEnum CUpgradeMgrEntity::SyncTime()
 	else
 	{
 		LogError(Severity_Low, rc, 0, "connect to entity [AccessAuthorization] fail");
+		pClient->SafeDelete();
 	}
-	pClient->SafeDelete();
+	//pClient->SafeDelete();
 
 	return rc;
 }
@@ -351,9 +354,10 @@ ErrorCodeEnum CUpgradeMgrEntity::PushUpdateTask(const CSimpleStringA &strPackNam
 	else
 	{
 		Dbg("connect to upgrade run entity fail: %d", rc);
+		pClient->SafeDelete();
 	}
 
-	pClient->SafeDelete();
+	//pClient->SafeDelete();
 	return rc;
 }
 
@@ -885,8 +889,9 @@ ErrorCodeEnum CUpgradeMgrEntity::StopMediaPlay()
 	else
 	{
 		LogError(Severity_Low, rc, 0, "connect to entity [LocalMediaPlay] fail");
+		pClient->SafeDelete();
 	}
-	pClient->SafeDelete();
+	//pClient->SafeDelete();
 
 	return rc;
 }

+ 2 - 1
Module/mod_UpgradeRun/mod_UpgradeRun.cpp

@@ -169,6 +169,7 @@ bool CUpgradeRunEntity::GetFirmwarePackUpgradeResult(const char *pszPackageName,
 	{
 		Dbg("connect PinPad fail, assume no pinpad");
 		strErrMsg = "connect PinPad fail, assume no pinpad";
+		pPinPadClient->SafeDelete();
 	}
 	else
 	{
@@ -239,7 +240,7 @@ bool CUpgradeRunEntity::GetFirmwarePackUpgradeResult(const char *pszPackageName,
 		pPinPadClient->GetFunction()->CloseSession();
 	}
 
-	pPinPadClient->SafeDelete();
+	//pPinPadClient->SafeDelete();
 	pPinPadClient = NULL;
 
 	return bUpdate;