Check to delete device info

Change-Id: Icc809b2111d7493c9a2b2adb0b854fd3f1b4ecd4
Signed-off-by: hyunuk.tak <hyunuk.tak@samsung.com>

diff --git a/packaging/ua-manager.spec b/packaging/ua-manager.spec
index fe076579912c544efdb3c5961a97079115f38f4a..56e909464a92bca3994c99f55b3484b6fcfabf1a 100644 (file)
--- a/packaging/ua-manager.spec
+++ b/packaging/ua-manager.spec
@@ -1,6 +1,6 @@
 Name:       ua-manager
 Summary:    User awareness manager
-Version:    0.14.16
+Version:    0.14.17
 Release:    1
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/ua-daemon/src/ua-manager-core.c b/ua-daemon/src/ua-manager-core.c
index d15c41b2a822cd55d8ebb8e902d9ba66d5059a0f..020ef0ce7ead9e3c6d807dedd37a780014d5451c 100755 (executable)
--- a/ua-daemon/src/ua-manager-core.c
+++ b/ua-daemon/src/ua-manager-core.c
@@ -1707,8 +1707,11 @@ static int __uam_remove_device(int user_id, uam_db_device_info_t *device,
                //TODO: check _uam_core_service_remove_device for app_num updates
                ret = _uam_core_service_remove_device(svc->name,
                                dev_info->device_id, dev_info->type, app_num);
-               if (UAM_ERROR_NONE != ret)
+               if (UAM_ERROR_NONE != ret) {
                        UAM_ERR("_uam_device_db_delete_device_info failed");
+                       __uam_db_end_transaction(0);
+                       return ret;
+               }
        }
        __uam_db_end_transaction(1);
 
@@ -2575,6 +2578,7 @@ int _uam_core_service_remove_device(const char *svc_name,
        GSList *l;
        char *mac;
        uam_db_tech_info_t *tech_info;
+       int ret = UAM_ERROR_NONE;
 
        retv_if(NULL == svc_name, UAM_ERROR_INVALID_PARAMETER);
        retv_if(NULL == device_id, UAM_ERROR_INVALID_PARAMETER);
@@ -2595,11 +2599,11 @@ int _uam_core_service_remove_device(const char *svc_name,
 
        mac = __get_mac_addr(tech_info);
        /* Remove service-device from DB */
-       _uam_db_delete_device_service_info(
+       ret = _uam_db_delete_device_service_info(
                        device_id, tech_type, mac, svc_name, app_num);
 
        FUNC_EXIT;
-       return UAM_ERROR_NONE;
+       return ret;
 }
 
 int _uam_core_service_set_device_discriminant(const char *svc_name,