[Release] wrt-plugins-common_0.3.116

Merge branch 'master' into tizen_2.2

Change-Id: Ic8094ba5f8c108fcdf41f09e8aca9160107c1a8c

diff --git a/packaging/wrt-plugins-common.spec b/packaging/wrt-plugins-common.spec
index 7332d6f..2530440 100644 (file)
--- a/packaging/wrt-plugins-common.spec
+++ b/packaging/wrt-plugins-common.spec
@@ -1,7 +1,7 @@
 #git:framework/web/wrt-plugins-common
 Name:       wrt-plugins-common
 Summary:    wrt-plugins common library
-Version:    0.3.115
+Version:    0.3.116
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0

diff --git a/src/plugins-installer/wrt_plugins_installer.cpp b/src/plugins-installer/wrt_plugins_installer.cpp
index b1f0ae2..c664350 100644 (file)
--- a/src/plugins-installer/wrt_plugins_installer.cpp
+++ b/src/plugins-installer/wrt_plugins_installer.cpp
@@ -23,19 +23,24 @@
 #include <dpl/log/log.h>
 #include <string>
 #include <cstdio>
+#include <dpl/exception.h>
 
 int main(int /*argc*/, char */*argv*/[])
 {
-    DPL::Log::LogSystemSingleton::Instance().SetTag("PLUGINS_INSTALLER");
-    LogDebug("Plugins installation started.");
+    UNHANDLED_EXCEPTION_HANDLER_BEGIN
+    {
+        DPL::Log::LogSystemSingleton::Instance().SetTag("PLUGINS_INSTALLER");
+        LogDebug("Plugins installation started.");
 
-    printf("Installing plugins...\n");
-    PluginsInstallerSingleton::Instance().initialize();
-    int installed =
-        PluginsInstallerSingleton::Instance().installAllPlugins();
-    PluginsInstallerSingleton::Instance().deinitialize();
-    printf("Completed: %d plugins installed.\n", installed);
+        printf("Installing plugins...\n");
+        PluginsInstallerSingleton::Instance().initialize();
+        int installed =
+            PluginsInstallerSingleton::Instance().installAllPlugins();
+        PluginsInstallerSingleton::Instance().deinitialize();
+        printf("Completed: %d plugins installed.\n", installed);
 
-    LogDebug("All plugins installed successfuly");
-    return 0;
+        LogDebug("All plugins installed successfuly");
+        return 0;
+    }
+    UNHANDLED_EXCEPTION_HANDLER_END
 }