From a2bd18bddc0489a1b99473dab1a62e85a3137025 Mon Sep 17 00:00:00 2001
From: Changgyu Choi <changyu.choi@samsung.com>
Date: Tue, 25 Aug 2020 09:22:16 +0900
Subject: [PATCH] Add exception handling

Change-Id: I4f8e53fe51f698708a0ddc59e814c1ff7801d587
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>
---
 parser/metadata/alias-appid/plugin_manager.cc   |  6 +++---
 parser/metadata/allowed-appid/plugin_manager.cc | 12 +++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/parser/metadata/alias-appid/plugin_manager.cc b/parser/metadata/alias-appid/plugin_manager.cc
index 44e13df..c057d5a 100644
--- a/parser/metadata/alias-appid/plugin_manager.cc
+++ b/parser/metadata/alias-appid/plugin_manager.cc
@@ -35,11 +35,11 @@ PluginManager& PluginManager::GetInst() {
 
 bool PluginManager::StepInstall(const std::unique_ptr<AppEventArgs>& args) {
   auto* db = dynamic_cast<AppSvcDB*>(GetDB());
-
   if (db == nullptr) {
     _E("MetadataPlugin is not prepared");
     return false;
   }
+
   for (auto& metadata : args->GetMetadataList()) {
     try {
       db->Insert(metadata->GetValue(), args->GetAppId());
@@ -52,11 +52,11 @@ bool PluginManager::StepInstall(const std::unique_ptr<AppEventArgs>& args) {
 
 bool PluginManager::StepUninstall(const std::unique_ptr<AppEventArgs>& args) {
   auto* db = dynamic_cast<AppSvcDB*>(GetDB());
-
   if (db == nullptr) {
     _E("MetadataPlugin is not prepared");
     return false;
   }
+
   if (args->GetMetadataList().empty()) {
     try {
       db->Delete(args->GetAppId());
@@ -78,11 +78,11 @@ bool PluginManager::StepUninstall(const std::unique_ptr<AppEventArgs>& args) {
 
 bool PluginManager::StepUpgrade(const std::unique_ptr<AppEventArgs>& args) {
   auto* db = dynamic_cast<AppSvcDB*>(GetDB());
-
   if (db == nullptr) {
     _E("MetadataPlugin is not prepared");
     return false;
   }
+
   try {
     db->Delete(args->GetAppId());
   } catch (Exception& e) {
diff --git a/parser/metadata/allowed-appid/plugin_manager.cc b/parser/metadata/allowed-appid/plugin_manager.cc
index 6f50a7e..d6de6c8 100644
--- a/parser/metadata/allowed-appid/plugin_manager.cc
+++ b/parser/metadata/allowed-appid/plugin_manager.cc
@@ -35,6 +35,11 @@ PluginManager& PluginManager::GetInst() {
 
 bool PluginManager::StepInstall(const std::unique_ptr<AppEventArgs>& args) {
   auto* db = dynamic_cast<AppSvcDB*>(GetDB());
+  if (db == nullptr) {
+    _E("MetadataPlugin is not prepared");
+    return false;
+  }
+
   for (auto& metadata : args->GetMetadataList()) {
     try {
       db->Insert(args->GetAppId(), metadata->GetValue());
@@ -46,8 +51,13 @@ bool PluginManager::StepInstall(const std::unique_ptr<AppEventArgs>& args) {
 }
 
 bool PluginManager::StepUninstall(const std::unique_ptr<AppEventArgs>& args) {
+  auto* db = dynamic_cast<AppSvcDB*>(GetDB());
+  if (db == nullptr) {
+    _E("MetadataPlugin is not prepared");
+    return false;
+  }
+
   try {
-    auto* db = dynamic_cast<AppSvcDB*>(GetDB());
     db->Delete(args->GetAppId());
   } catch (Exception& e) {
     _W("Failed to delete alias info. appid(%s)", args->GetAppId().c_str());
-- 
2.7.4