From 108c3939a83c78c78f10549610bff4ee06d84010 Mon Sep 17 00:00:00 2001 From: Kevron Rees Date: Fri, 7 Sep 2012 20:33:05 -0700 Subject: [PATCH] made setConfiguration virtual --- ambd/config | 13 +++++++------ ambd/pluginloader.cpp | 3 ++- lib/abstractsink.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ambd/config b/ambd/config index 189b4a4..da5b836 100644 --- a/ambd/config +++ b/ambd/config @@ -6,16 +6,17 @@ } ], "sinks": [ - { "name" : "ExampleSink", - "path" : "/usr/lib/automotive-message-broker/examplesinkplugin.so" + { + "name" : "ExampleSink", + "path" : "/usr/lib/automotive-message-broker/examplesinkplugin.so" }, { - "name" : "DBusSink", - "path" : "/usr/lib/automotive-message-broker/dbussinkplugin.so" + "name" : "DBusSink", + "path" : "/usr/lib/automotive-message-broker/dbussinkplugin.so" }, { - "name" : "WebSocketSink", - "path" : "/usr/lib/automotive-message-broker/websocketsinkplugin.so" + "name" : "WebSocketSink", + "path" : "/usr/lib/automotive-message-broker/websocketsinkplugin.so" } ] } diff --git a/ambd/pluginloader.cpp b/ambd/pluginloader.cpp index b1a8c84..4e63f97 100644 --- a/ambd/pluginloader.cpp +++ b/ambd/pluginloader.cpp @@ -134,13 +134,14 @@ PluginLoader::PluginLoader(string configFile, AbstractRoutingEngine* re): f_crea json_reader_end_member(reader); AbstractSinkManager* plugin = loadPlugin(path); - plugin->setConfiguration(configurationMap); if(plugin == nullptr) { throw std::runtime_error("plugin is not a SinkManager"); } + plugin->setConfiguration(configurationMap); + json_reader_end_element(reader); } diff --git a/lib/abstractsink.h b/lib/abstractsink.h index 391ecd7..6c5b907 100644 --- a/lib/abstractsink.h +++ b/lib/abstractsink.h @@ -61,7 +61,7 @@ public: virtual void supportedChanged(PropertyList supportedProperties) = 0; - void setConfiguration(map config); + virtual void setConfiguration(map config); protected: AbstractRoutingEngine* routingEngine; -- 2.7.4