X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fserver%2Fdatabase%2Fcreate_db_handler.cc;h=7ef265e765f1af1c681b95b13688fdb467aa39fe;hb=c55816f64e12a6032e037523673aaf802dfdee55;hp=da918fe24b69ced359b5f4357ca03f14cc031a86;hpb=e3f874b7b123fd509bf8388dd94f2e0341d4f4ec;p=platform%2Fcore%2Fappfw%2Fpkgmgr-info.git

diff --git a/src/server/database/create_db_handler.cc b/src/server/database/create_db_handler.cc
index da918fe..7ef265e 100644
--- a/src/server/database/create_db_handler.cc
+++ b/src/server/database/create_db_handler.cc
@@ -44,18 +44,16 @@ std::vector<std::vector<std::string>> CreateDBHandler::GetResult() {
 }
 
 int CreateDBHandler::Execute() {
-  std::unique_lock<std::shared_timed_mutex> u(lock_);
+  std::unique_lock<std::shared_mutex> u(lock_);
 
   if (CreateParserDB() < 0) {
     LOG(ERROR) << "Failed to create parser db for uid : " << GetUID();
     return PMINFO_R_ERROR;
   }
 
-  if (GetUID() == GLOBAL_USER || GetUID() == OWNER_ROOT) {
-    if (CreateCertDB() < 0) {
-      LOG(ERROR) << "Failed to create cert db";
-      return PMINFO_R_ERROR;
-    }
+  if (CreateCertDB() < 0) {
+    LOG(ERROR) << "Failed to create cert db";
+    return PMINFO_R_ERROR;
   }
 
   return PMINFO_R_OK;
@@ -68,25 +66,22 @@ int CreateDBHandler::CreateParserDB() {
   if (!Connect())
     return PMINFO_R_ERROR;
 
-  std::vector<std::pair<sqlite3*, uid_t>> conn_list = GetConnection();
-  sqlite3* conn = conn_list.front().first;
-  uid_t uid = conn_list.front().second;
-
-  return pkgmgr_parser_internal_initialize_db(conn, uid);
+  const auto& [db, uid] = GetConnection().front();
+  return internal::InitializeDb(db, uid);
 }
 
 int CreateDBHandler::CreateCertDB() {
+  if (GetUID() != GLOBAL_USER && GetUID() != OWNER_ROOT)
+    return PMINFO_R_OK;
+
   SetDBType(pkgmgr_common::DBType::DB_TYPE_FILE_CERTDB);
   ClearDBHandle();
 
   if (!Connect())
     return PMINFO_R_ERROR;
 
-  std::vector<std::pair<sqlite3*, uid_t>> conn_list = GetConnection();
-  sqlite3* conn = conn_list.front().first;
-  uid_t uid = conn_list.front().second;
-
-  return pkgmgr_parser_internal_initialize_db(conn, uid);
+  const auto& [db, uid] = GetConnection().front();
+  return internal::InitializeDb(db, uid);
 }
 
 }  // namespace database