From f7f8edb8754994db798cd94ce18b2825b4b7df36 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 20 Apr 2012 15:49:12 +0200 Subject: [PATCH] Cleaned up configrpc. --- components/configrpc/configrpccomponent.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/components/configrpc/configrpccomponent.cpp b/components/configrpc/configrpccomponent.cpp index 1f85e505c..365568de8 100644 --- a/components/configrpc/configrpccomponent.cpp +++ b/components/configrpc/configrpccomponent.cpp @@ -85,14 +85,8 @@ JsonRpcRequest ConfigRpcComponent::MakeObjectMessage(const ConfigObject::Ptr& ob params.GetDictionary()->SetPropertyString("name", object->GetName()); params.GetDictionary()->SetPropertyString("type", object->GetType()); - if (includeProperties) { - Message properties; - params.GetDictionary()->SetPropertyDictionary("properties", properties.GetDictionary()); - - for (ConfigObject::ParameterIterator pi = object->Properties.begin(); pi != object->Properties.end(); pi++) { - properties.GetDictionary()->SetPropertyString(pi->first, pi->second); - } - } + if (includeProperties) + params.SetPropertyMessage("properties", Message(object)); return msg; } @@ -101,7 +95,7 @@ bool ConfigRpcComponent::ShouldReplicateObject(const ConfigObject::Ptr& object) { long replicate; if (!object->GetPropertyInteger("replicate", &replicate)) - return false; + return true; return (replicate != 0); } -- 2.50.1