1 files changed, 25 insertions, 9 deletions

diff --git a/src/agent/service-engine/se_sync.c b/src/agent/service-engine/se_sync.c
index 367b89b..a50098d 100755
--- a/src/agent/service-engine/se_sync.c
+++ b/src/agent/service-engine/se_sync.c
@@ -134,11 +134,11 @@ static int __convert_src_uri_value(char *src_uri)
 
 	if (strcmp(src_uri,DEFINE_SOURCE_CONTACT_URI) == 0) {
 		src_uri_value = SRC_URI_CONTACT;
-	} else if (strcmp(src_uri,DEFINE_SOURCE_CALENDAR_URI)) {
+	} else if (strcmp(src_uri,DEFINE_SOURCE_CALENDAR_URI) == 0) {
 		src_uri_value = SRC_URI_CALENDAR;
-	} else if (strcmp(src_uri,DEFINE_SOURCE_MEMO_URI)) {
+	} else if (strcmp(src_uri,DEFINE_SOURCE_MEMO_URI) == 0) {
 		src_uri_value = SRC_URI_MEMO;
-	} else if (strcmp(src_uri,DEFINE_SOURCE_CALLLOG_URI)) {
+	} else if (strcmp(src_uri,DEFINE_SOURCE_CALLLOG_URI) == 0) {
 		src_uri_value = SRC_URI_CALLLOG;
 	} else {
 		_DEBUG_ERROR("src_uri is invalid!!");
@@ -155,7 +155,6 @@ static se_error_type_e _session_process(int account_id, alert_type_e server_sync
 	char *profileDirName = NULL;
 	se_error_type_e err = SE_INTERNAL_OK;
 	bool result;
-	int sync_type_value = 0;
 
 	result = get_config(account_id, DEFINE_CONFIG_KEY_PROFILE_DIR_NAME, &profileDirName);
 	if (result == false) {
@@ -164,11 +163,9 @@ static se_error_type_e _session_process(int account_id, alert_type_e server_sync
 		goto error;
 	}
 
-      sync_type_value = __convert_alert_to_sync_type_value(server_sync_type);
-	_DEBUG_INFO("sync_type_value: [%d]", sync_type_value);
-
 	if (profileDirName != NULL) {
-		err = session_process(profileDirName, sync_type_value, process, error);
+		_DEBUG_INFO("profileDirName: [%s]", profileDirName);
+		err = session_process(profileDirName, server_sync_type, process, error);
 		if (err != SE_INTERNAL_OK) {
 			_DEBUG_ERROR("failed to send noti");
 			goto error;
@@ -803,6 +800,13 @@ static se_error_type_e _assemble_changed_datastores(int account_id, alert_type_e
 {
 	_INNER_FUNC_ENTER;
 
+	if (account_id < 1){
+		_DEBUG_ERROR("account_id is invalid!!");
+		return SE_INTERNAL_ERROR;
+	} else {
+		_DEBUG_INFO("account_id: [%d]", account_id);
+	}
+
 	se_error_type_e err = SE_INTERNAL_OK;
 	changed_datastore_s *pChangedDatastore = NULL;
 	sync_agent_da_return_e da_err = SYNC_AGENT_DA_SUCCESS;
@@ -2657,7 +2661,12 @@ bool synchronize(int account_id, char *sync_mode, san_package_s * san_package)
 {
 	_EXTERN_FUNC_ENTER;
 
-	_DEBUG_INFO("accountID = %d", account_id);
+	if (account_id < 1) {
+		_DEBUG_ERROR("account_id is invalid!!");
+		return false;
+	}
+
+	_DEBUG_INFO("account_id = %d", account_id);
 	_DEBUG_INFO("sync_mode = %s", sync_mode);
 
 	/*FIXME remove msg file */
@@ -3295,6 +3304,13 @@ bool refresh_from_service_all(int account_id)
 {
 	_EXTERN_FUNC_ENTER;
 
+	if (account_id < 1) {

+		_DEBUG_ERROR("account_id is invalid!!");
+		return false;
+	} else {
+		_DEBUG_INFO("account_id: [%d]", account_id);
+	}
+
 	se_error_type_e err = SE_INTERNAL_OK;
 
 	sync_agent_da_return_e da_err = sync_agent_open_agent();