[Release] wrt-plugins-common_0.3.80

Change-Id: Ie8a21aafcd2d2e1f5cb225174504b259386c4bd4

diff --git a/packaging/wrt-plugins-common.spec b/packaging/wrt-plugins-common.spec
index 48d6742..82e56e8 100644 (file)
--- 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.79
+#git:framework/web/wrt-plugins-common wrt-plugins-common_0.3.80
 Name:       wrt-plugins-common
 Summary:    wrt-plugins common library
-Version:    0.3.79
+Version:    0.3.80
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0

diff --git a/src/plugin-loading/js_page_session.cpp b/src/plugin-loading/js_page_session.cpp
index bc9d44f..8b2f7ab 100644 (file)
--- a/src/plugin-loading/js_page_session.cpp
+++ b/src/plugin-loading/js_page_session.cpp
@@ -230,7 +230,14 @@ void JSPageSession::Impl::installRequestedFeatures()
     {
         LogDebug("Processing feature: " << *feature);
 
-        auto plugin = m_pluginsSupport->getPluginForFeature(*feature);
+        PluginModelPtr plugin = m_pluginsSupport->getPluginForFeature(*feature);
+
+        if (!plugin)
+        {
+            LogDebug("It didn't have plugins! : " << *feature);
+            continue;
+        }
+
         ImplementedObjectsList implObjs =
             PluginDAOReadOnly::
                 getImplementedObjectsForPluginHandle(plugin->Handle.Get());

diff --git a/src/plugin-loading/plugin_container_support.cpp b/src/plugin-loading/plugin_container_support.cpp
index 41effcf..7eabd46 100644 (file)
--- a/src/plugin-loading/plugin_container_support.cpp
+++ b/src/plugin-loading/plugin_container_support.cpp
@@ -228,11 +228,16 @@ PluginContainerSupport::getPluginModelById(DbPluginHandle handle) const
 PluginModelPtr
 PluginContainerSupport::getPluginModel(const FeatureModelPtr &feature) const
 {
-    LogDebug("");
-    Assert(feature && "Null Ptr for feature model");
-    LogDebug("Feature located in plugin: " << feature->PHandle.Get());
-
-    return getPluginModelById(feature->PHandle.Get());
+    if (!feature)
+    {
+        LogDebug("Null Ptr for feature model");
+        return PluginModelPtr();
+    }
+    else
+    {
+        LogDebug("Feature located in plugin: " << feature->PHandle.Get());
+        return getPluginModelById(feature->PHandle.Get());
+    }
 }
 
  PluginContainerSupport::PluginsList