From: Abhishek Vijay Date: Thu, 8 Mar 2018 09:16:34 +0000 (+0530) Subject: [Non-ACR][Fixed SVACE Issues] X-Git-Tag: submit/tizen/20180320.092609^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=088bb171a8a36be9accf5b29e86a75d50fa3818f;p=platform%2Fcore%2Faccount%2Fsync-manager.git [Non-ACR][Fixed SVACE Issues] Signed-off-by: Abhishek Vijay Change-Id: I8830e0682e73a8acfa962630e2427a9b5d0b61e8 --- diff --git a/src/sync-service/SyncManager_RepositoryEngine.cpp b/src/sync-service/SyncManager_RepositoryEngine.cpp index 980afa8..034a68e 100644 --- a/src/sync-service/SyncManager_RepositoryEngine.cpp +++ b/src/sync-service/SyncManager_RepositoryEngine.cpp @@ -141,14 +141,10 @@ RepositoryEngine::~RepositoryEngine(void) { RepositoryEngine::RepositoryEngine(void) { - if (pthread_mutex_init(&__capabilityInfoMutex, NULL) != 0) { + if (pthread_mutex_init(&__capabilityInfoMutex, NULL) != 0) LOG_LOGD("__capabilityInfoMutex init failed"); /* LCOV_EXCL_LINE */ - return; - } - if (pthread_mutex_init(&__syncDBReadWriteMutex, NULL) != 0) { + if (pthread_mutex_init(&__syncDBReadWriteMutex, NULL) != 0) LOG_LOGD("__syncDBReadWriteMutex init failed"); /* LCOV_EXCL_LINE */ - return; - } } @@ -333,7 +329,6 @@ RepositoryEngine::ReadSyncJobsData(void) { /* process for removing previous data */ xmlNodePtr rootNode; - stringstream ss; doc = xmlNewDoc(_VERSION); @@ -430,7 +425,6 @@ RepositoryEngine::ReadSyncAdapters(void) { /* process for removing previous data */ xmlNodePtr rootNode; - stringstream ss; doc = xmlNewDoc(_VERSION); @@ -1677,10 +1671,10 @@ static void bundIterCb(const char *key, const char *value, void *user_data) { UserValue = const_cast(value); } - +/* static std::string setEmpty(void) { return ""; -} +}*/ int @@ -1708,8 +1702,8 @@ RepositoryEngine::InsertSyncJobToDB(const char *SvcAppId, const char *PkgName, i char noRetry[2] = { 0, }; snprintf(noRetry, sizeof(noRetry) - 1, "%d", Option & SYNC_OPTION_NO_RETRY); - UserKey = const_cast(setEmpty().c_str()); - UserValue = const_cast(setEmpty().c_str()); + UserKey = const_cast(std::string().c_str()); + UserValue = const_cast(std::string().c_str()); if (UserData) bundle_iterate(UserData, bundIterCb, NULL); @@ -1883,8 +1877,8 @@ RepositoryEngine::UpdateSyncJobToDB(const char *SvcAppId, int UserId, const char char noRetry[2] = { 0, }; snprintf(noRetry, sizeof(noRetry) - 1, "%d", Option & SYNC_OPTION_NO_RETRY); - UserKey = const_cast(setEmpty().c_str()); - UserValue = const_cast(setEmpty().c_str()); + UserKey = const_cast(std::string().c_str()); + UserValue = const_cast(std::string().c_str()); if (UserData) bundle_iterate(UserData, bundIterCb, NULL); diff --git a/src/sync-service/SyncManager_SyncWorker.cpp b/src/sync-service/SyncManager_SyncWorker.cpp index ef9a36e..98705b9 100644 --- a/src/sync-service/SyncManager_SyncWorker.cpp +++ b/src/sync-service/SyncManager_SyncWorker.cpp @@ -23,7 +23,7 @@ #include "sync-log.h" #include "sync-error.h" #include "SyncManager_SyncWorker.h" - +#include "SyncManager_SyncJob.h" /*namespace _SyncManager {*/ @@ -111,6 +111,10 @@ SyncWorker::Finalize(void) { for (std::list::iterator it = __pendingRequests.begin(); it != __pendingRequests.end();) { RequestData* pRequestData = *it; + if ((pRequestData->message).pSyncJob != NULL) { + delete (pRequestData->message).pSyncJob; + (pRequestData->message).pSyncJob = NULL; + } delete pRequestData; pRequestData = NULL; it = __pendingRequests.erase(it);