From 82d15c6f2adac5e84c3465d84ce5b46311ae26a5 Mon Sep 17 00:00:00 2001
From: Jihoon Chung <jihoon.chung@samsung.com>
Date: Fri, 19 Apr 2013 20:48:07 +0900
Subject: [PATCH] [Release] wrt-plugins-common_0.3.81

---
 packaging/wrt-plugins-common.spec          |  4 ++--
 src/plugin-loading/plugin.cpp              |  4 +++-
 src/plugins-api-support/PluginRegistry.cpp | 12 ++++++++----
 src/plugins-installer/plugin_installer.cpp |  9 ++++++---
 wrt-plugins-common.manifest                |  4 ----
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/packaging/wrt-plugins-common.spec b/packaging/wrt-plugins-common.spec
index 82e56e8..9887776 100644
--- a/packaging/wrt-plugins-common.spec
+++ b/packaging/wrt-plugins-common.spec
@@ -1,7 +1,7 @@
-#git:framework/web/wrt-plugins-common wrt-plugins-common_0.3.80
+#git:framework/web/wrt-plugins-common wrt-plugins-common_0.3.81
 Name:       wrt-plugins-common
 Summary:    wrt-plugins common library
-Version:    0.3.80
+Version:    0.3.81
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0
diff --git a/src/plugin-loading/plugin.cpp b/src/plugin-loading/plugin.cpp
index 7a468a4..3a7ab0d 100644
--- a/src/plugin-loading/plugin.cpp
+++ b/src/plugin-loading/plugin.cpp
@@ -64,8 +64,10 @@ PluginPtr Plugin::LoadFromFile(const std::string& fileName)
     LogDebug("dlopen() done!");
 
     if (dllHandle == NULL) {
+        const char* error = (const char*)dlerror();
         LogError(
-            "Failed to load plugin: " << fileName << ". Reason: " << dlerror());
+            "Failed to load plugin: " << fileName <<
+            ". Reason: " << (error != NULL ? error : "unknown"));
         PluginPtr empty;
         return empty;
     }
diff --git a/src/plugins-api-support/PluginRegistry.cpp b/src/plugins-api-support/PluginRegistry.cpp
index af9cc2d..adf6563 100644
--- a/src/plugins-api-support/PluginRegistry.cpp
+++ b/src/plugins-api-support/PluginRegistry.cpp
@@ -83,7 +83,8 @@ void PluginRegistry::UnloadAll()
         if (m_plugins.end() != pluginIt) {
             void* handle = dlopen(libraryIt->first.c_str(), RTLD_NOW);
             if (!handle) {
-                LogError("Error: " << dlerror());
+                const char* error = (const char*)dlerror();
+                LogError("Error: " << (error != NULL ? error : "unknown"));
                 continue;
             }
 
@@ -91,7 +92,8 @@ void PluginRegistry::UnloadAll()
                 static_cast<ExportedApi*>
                 (dlsym(handle, GetExportedSymbolName()));
             if (NULL == entryPoint) {
-                LogError("Error: " << dlerror());
+                const char* error = (const char*)dlerror();
+                LogError("Error: " << (error != NULL ? error : "unknown"));
                 continue;
             }
             if (entryPoint->Unregister == NULL) {
@@ -114,7 +116,8 @@ bool PluginRegistry::LoadFromFile(const std::string& libraryName)
 {
     void* handle = dlopen(libraryName.c_str(), RTLD_NOW);
     if (!handle) {
-        LogError("Error: " << dlerror());
+        const char* error = (const char*)dlerror();
+        LogError("Error: " << (error != NULL ? error : "unknown"));
         return false;
     }
     m_libraries[libraryName] = handle;
@@ -122,7 +125,8 @@ bool PluginRegistry::LoadFromFile(const std::string& libraryName)
     ExportedApi* entryPoint =
         static_cast<ExportedApi*>(dlsym(handle, GetExportedSymbolName()));
     if (NULL == entryPoint) {
-        LogError("Error: " << dlerror());
+        const char* error = (const char*)dlerror();
+        LogError("Error: " << (error != NULL ? error : "unknown"));
         return false;
     }
 
diff --git a/src/plugins-installer/plugin_installer.cpp b/src/plugins-installer/plugin_installer.cpp
index 929971b..68afd5f 100644
--- a/src/plugins-installer/plugin_installer.cpp
+++ b/src/plugins-installer/plugin_installer.cpp
@@ -238,9 +238,10 @@ PluginObjectsPtr PluginsInstaller::loadLibraryFromMetafile(
 
     void *dlHandle = dlopen(libName.c_str(), RTLD_NOW);
     if (dlHandle == NULL) {
+        const char* error = (const char*)dlerror();
         LogError(
             "Failed to load plugin: " << libName <<
-            ". Reason: " << dlerror());
+            ". Reason: " << (error != NULL ? error : "unknown"));
         ThrowMsg(PluginInstall::Exceptions::LibraryException, "Library error");
     }
 
@@ -606,8 +607,9 @@ bool PluginsInstaller::fillMappingInterfaces(PluginMetafileData& pluginData,
 {
     void *dlHandle = dlopen(filename.c_str(), RTLD_NOW);
     if (dlHandle == NULL) {
+        const char* error = (const char*)dlerror();
         LogError(
-            "Failed to load plugin: " << filename << ". Reason: " << dlerror());
+            "Failed to load plugin: " << filename << ". Reason: " << (error != NULL ? error : "unknown"));
         return false;
     }
     Try
@@ -615,7 +617,8 @@ bool PluginsInstaller::fillMappingInterfaces(PluginMetafileData& pluginData,
         ExportedApi* entryPoint =
             static_cast<ExportedApi*>(dlsym(dlHandle, GetExportedSymbolName()));
         if (NULL == entryPoint) {
-            LogError("Error: " << dlerror());
+            const char* error = (const char*)dlerror();
+            LogError("Error: " << (error != NULL ? error : "unknown"));
             ThrowMsg(PluginInstall::Exceptions::LibraryException,
                      "Library error");
         }
diff --git a/wrt-plugins-common.manifest b/wrt-plugins-common.manifest
index 32dd898..fc61a9b 100644
--- a/wrt-plugins-common.manifest
+++ b/wrt-plugins-common.manifest
@@ -2,10 +2,6 @@
   <define>
     <domain name="wrt-plugins-common"/>
   </define>
-  <assign>
-    <filesystem path="/usr/bin/wrt-popup-ace-runtime" label="wrt-popup-ace-runtime" exec_label="wrt-popup-ace-runtime"/>
-    <filesystem path="/usr/bin/wrt-popup-wrt-runtime" label="wrt-popup-wrt-runtime" exec_label="wrt-popup-wrt-runtime"/>
-  </assign>
   <request>
     <domain name="_"/>
   </request>
-- 
2.7.4