Add try-catch statements for error handling

Change-Id: Ia2145de1f60400959e2c840c4d22eb9ece0996a1
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/unified/unified_backend.cc b/src/unified/unified_backend.cc
index 2221bf8..3c4bb44 100644 (file)
--- a/src/unified/unified_backend.cc
+++ b/src/unified/unified_backend.cc
@@ -12,11 +12,15 @@ namespace ci = common_installer;
 
 int main(int argc, char** argv) {
   ci::PkgmgrInstaller pkgmgr_installer;
-  auto pkgmgr = ci::PkgMgrInterface::Create(argc, argv, &pkgmgr_installer);
+  try {
+    auto pkgmgr = ci::PkgMgrInterface::Create(argc, argv, &pkgmgr_installer);
 
-  ci::InstallerRunner runner(
-      std::make_unique<ci::UnifiedInstallerFactory>(), pkgmgr);
-  ci::AppInstaller::Result result = runner.Run();
-
-  return (result == ci::AppInstaller::Result::OK) ? 0 : 1;
+    ci::InstallerRunner runner(
+        std::make_unique<ci::UnifiedInstallerFactory>(), pkgmgr);
+    ci::AppInstaller::Result result = runner.Run();
+    return (result == ci::AppInstaller::Result::OK) ? 0 : 1;
+  } catch(...) {
+    LOG(ERROR) << "Exception occured";
+    return 1;
+  }
 }

diff --git a/test/smoke_test/smoke_test_helper.cc b/test/smoke_test/smoke_test_helper.cc
index 755cd17..4dfc186 100644 (file)
--- a/test/smoke_test/smoke_test_helper.cc
+++ b/test/smoke_test/smoke_test_helper.cc
@@ -60,10 +60,16 @@ class CrashInstallerFactory : public ci::InstallerFactory {
 
 int main(int argc, char** argv) {
   ci::PkgmgrInstaller pkgmgr_installer;
-  auto pkgmgr = ci::PkgMgrInterface::Create(argc, argv, &pkgmgr_installer);
+  try {
+    auto pkgmgr = ci::PkgMgrInterface::Create(argc, argv, &pkgmgr_installer);
 
-  ci::InstallerRunner runner(std::make_unique<CrashInstallerFactory>(), pkgmgr);
-  ci::AppInstaller::Result result = runner.Run();
+    ci::InstallerRunner runner(
+        std::make_unique<CrashInstallerFactory>(), pkgmgr);
+    ci::AppInstaller::Result result = runner.Run();
 
-  return (result == ci::AppInstaller::Result::OK) ? 0 : 1;
+    return (result == ci::AppInstaller::Result::OK) ? 0 : 1;
+  } catch(...) {
+    LOG(ERROR) << "Exception occured";
+    return 1;
+  }
 }