Remove abort function for fix crash

Change-Id: Ie3e8dd4b25d9aa285abcf5505655b3c4aea1e72a
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>

diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec
index e6cbbbb..9e367f8 100755 (executable)
--- a/packaging/nfc-manager.spec
+++ b/packaging/nfc-manager.spec
@@ -1,6 +1,6 @@
 Name:       nfc-manager
 Summary:    NFC framework manager
-Version:    0.1.175
+Version:    0.1.176
 Release:    0
 Group:      Network & Connectivity/NFC
 License:    Flora-1.1

diff --git a/src/manager/include/net_nfc_server_common.h b/src/manager/include/net_nfc_server_common.h
index 2aa45b7..0bebf91 100755 (executable)
--- a/src/manager/include/net_nfc_server_common.h
+++ b/src/manager/include/net_nfc_server_common.h
@@ -57,6 +57,6 @@ guint32 net_nfc_server_get_state(void);
 void net_nfc_server_controller_run_dispatch_loop();
 void net_nfc_server_controller_quit_dispatch_loop();
 
-void net_nfc_server_controller_init_sync();
+bool net_nfc_server_controller_init_sync();
 
 #endif                                                 //__NET_NFC_SERVER_COMMON_H__

diff --git a/src/manager/net_nfc_manager.c b/src/manager/net_nfc_manager.c
index 4d5e5c6..4100aeb 100755 (executable)
--- a/src/manager/net_nfc_manager.c
+++ b/src/manager/net_nfc_manager.c
@@ -81,13 +81,14 @@ static void on_bus_acquired(GDBusConnection * connection, const gchar * path, gp
 
        DEBUG_SERVER_MSG("bus path : %s", path);
 
-       net_nfc_server_gdbus_init();
+       bool ret = net_nfc_server_controller_init_sync();
+       if (ret == false) {
+               DEBUG_SERVER_MSG("Controller Init failed");
 
-#if 0
-       net_nfc_server_controller_init();
-#else
-       net_nfc_server_controller_init_sync();
-#endif
+               return;
+       }
+
+       net_nfc_server_gdbus_init();
 
        if (vconf_get_bool(VCONFKEY_NFC_STATE, &state) != 0) {
                DEBUG_SERVER_MSG("VCONFKEY_NFC_STATE is not exist");

diff --git a/src/manager/net_nfc_server_common.c b/src/manager/net_nfc_server_common.c
index 32233ec..6b85193 100755 (executable)
--- a/src/manager/net_nfc_server_common.c
+++ b/src/manager/net_nfc_server_common.c
@@ -646,17 +646,15 @@ guint32 net_nfc_server_get_state(void)
        return server_state;
 }
 
-void net_nfc_server_controller_init_sync(void)
+bool net_nfc_server_controller_init_sync(void)
 {
        net_nfc_error_e result;
 
        if (net_nfc_controller_init(&result) == false) {
                DEBUG_ERR_MSG("net_nfc_controller_init failed, [%d]", result);
 
-               /* ADD TEMPORARY ABORT FOR DEBUG */
-               abort();
-//      net_nfc_manager_quit();
-               return;
+               net_nfc_manager_quit();
+               return false;
        }
 
        DEBUG_SERVER_MSG("net_nfc_controller_init success, [%d]", result);
@@ -664,8 +662,8 @@ void net_nfc_server_controller_init_sync(void)
        if (net_nfc_controller_register_listener(controller_target_detected_cb, controller_se_transaction_cb, controller_llcp_event_cb, controller_hce_apdu_cb, &result) == false) {
                DEBUG_ERR_MSG("net_nfc_contorller_register_listener failed [%d]", result);
 
-               /* ADD TEMPORARY ABORT FOR DEBUG */
-               abort();
+               net_nfc_manager_quit();
+               return false;
        }
 
        DEBUG_SERVER_MSG("net_nfc_contorller_register_listener success");
@@ -674,9 +672,11 @@ void net_nfc_server_controller_init_sync(void)
        if (result != NET_NFC_OK) {
                DEBUG_ERR_MSG("net_nfc_server_llcp_set config failed, [%d]", result);
 
-               /* ADD TEMPORARY ABORT FOR DEBUG */
-               abort();
+               net_nfc_manager_quit();
+               return false;
        }
 
        DEBUG_SERVER_MSG("net_nfc_server_llcp_set_config success");
+
+       return true;
 }