Set maximum attempts to access db in case db is locked

Change-Id: Ibed4b25c766e8e84ca6446737db8ccaa5aea4440
Signed-off-by: Abhay agarwal <ay.agarwal@samsung.com>

diff --git a/ua-daemon/include/ua-manager-database.h b/ua-daemon/include/ua-manager-database.h
index 4361d31..b579017 100644 (file)
--- a/ua-daemon/include/ua-manager-database.h
+++ b/ua-daemon/include/ua-manager-database.h
@@ -68,17 +68,16 @@ extern "C" {
        } \
 } while (0)
 
-#define DB_CHECK(expr) \
-       do { \
-               if (expr) { \
-                       UAM_ERR("(%s) return", #expr); \
-                       unlink(DATABASE_FULL_PATH); \
-                       database = NULL; \
-                       /* Reopen database */ \
-                       retv_if(SQLITE_OK != __uam_db_open(), UAM_ERROR_DB_FAILED); \
-                       __uam_db_prepare_table(); \
-               } \
-       } while (0)
+#define DB_CHECK(expr) do { \
+       if (expr) { \
+               UAM_ERR("(%s) return", #expr); \
+               unlink(DATABASE_FULL_PATH); \
+               database = NULL; \
+               /* Reopen database */ \
+               retv_if(SQLITE_OK != __uam_db_open(), UAM_ERROR_DB_FAILED); \
+               __uam_db_prepare_table(); \
+       } \
+} while (0)
 
 /* Helper Functions */
 int _uam_db_initialize_once(void);

diff --git a/ua-daemon/src/ua-manager-user-db.c b/ua-daemon/src/ua-manager-user-db.c
index 2d1f547..45ac889 100644 (file)
--- a/ua-daemon/src/ua-manager-user-db.c
+++ b/ua-daemon/src/ua-manager-user-db.c
@@ -232,7 +232,6 @@ int _uam_db_get_max_user_id(void)
 int _uam_user_db_initialize(void)
 {
        FUNC_ENTRY;
-       database = NULL;
 
        EXEC(UAM_ERROR_NONE, __ua_table_usersinfo_prepare(database), handle_error);