Fix gatt_server_add_service fail issue

Even if all servers are not removed, the interface of object manager must be unregistered.

Change-Id: I2723ad4ee057b0fd80c975eb5ced836944f6b0e0
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/bt-oal/bluez_hal/src/bt-hal-gatt-server.c b/bt-oal/bluez_hal/src/bt-hal-gatt-server.c
index fe472f1..5ff6c54 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-gatt-server.c
+++ b/bt-oal/bluez_hal/src/bt-hal-gatt-server.c
@@ -2393,13 +2393,14 @@ static void __bt_hal_gatt_deinit(char *app_path)
                        (GAsyncReadyCallback)__bt_hal_unregister_application_cb,
                        (gpointer)data);
 
+       /* unregister the exported interface for object manager */
+       g_dbus_connection_unregister_object(g_conn, manager_id);
+       manager_id = 0;
+
        /* If requested app is last GATT Server app, then clean all resources */
        if (gatt_server_apps == NULL) {
                INFO("All GATT servers are removed, clean all DBUS resources");
                if (owner_id) {
-                       /* unregister the exported interface for object manager */
-                       g_dbus_connection_unregister_object(g_conn, manager_id);
-                       manager_id = 0;
                        g_bus_unown_name(owner_id);
                        owner_id = 0;