tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Even more bugfixes.

This commit is contained in:
Gunnar Beutner 2012-06-12 11:34:48 +02:00
parent 900e65d009
commit c44d8d5912
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
base/variant.cpp
View File

@ -38,6 +38,15 @@ void Variant::Convert(VariantType newType) const
return; return;
} }
if (m_Type == VariantInteger && newType == VariantString) {
stringstream sbuf;
sbuf << m_IntegerValue;
m_StringValue = sbuf.str();
m_Type = VariantString;
return;
}
// TODO: convert variant data // TODO: convert variant data
throw runtime_error("Invalid variant conversion."); throw runtime_error("Invalid variant conversion.");
} }

4
components/configrpc/configrpccomponent.cpp
View File

@ -128,7 +128,7 @@ int ConfigRpcComponent::FetchObjectsHandler(const NewRequestEventArgs& ea)
int ConfigRpcComponent::LocalObjectCommittedHandler(const ObjectSetEventArgs<ConfigObject::Ptr>& ea) int ConfigRpcComponent::LocalObjectCommittedHandler(const ObjectSetEventArgs<ConfigObject::Ptr>& ea)
{ {
ConfigObject::Ptr object = static_pointer_cast<ConfigObject>(ea.Source); ConfigObject::Ptr object = ea.Target;
if (!ShouldReplicateObject(object)) if (!ShouldReplicateObject(object))
return 0; return 0;
@ -141,7 +141,7 @@ int ConfigRpcComponent::LocalObjectCommittedHandler(const ObjectSetEventArgs<Con
int ConfigRpcComponent::LocalObjectRemovedHandler(const ObjectSetEventArgs<ConfigObject::Ptr>& ea) int ConfigRpcComponent::LocalObjectRemovedHandler(const ObjectSetEventArgs<ConfigObject::Ptr>& ea)
{ {
ConfigObject::Ptr object = static_pointer_cast<ConfigObject>(ea.Source); ConfigObject::Ptr object = ea.Target;
if (!ShouldReplicateObject(object)) if (!ShouldReplicateObject(object))
return 0; return 0;