Commit b33fe51a authored by Tristan Matthews's avatar Tristan Matthews
Browse files

Merge branch 'master' into sipregistration

Resolved Conflicts:
	daemon/src/sip/sipvoiplink.cpp
parents 904f7882 f2762ba6
...@@ -107,12 +107,10 @@ YamlNode *MappingNode::getValue(const std::string &key) const ...@@ -107,12 +107,10 @@ YamlNode *MappingNode::getValue(const std::string &key) const
{ {
Mapping::const_iterator it = map_.find(key); Mapping::const_iterator it = map_.find(key);
if (it != map_.end()) { if (it != map_.end())
return it->second; return it->second;
} else { else
DEBUG("MappingNode: Could not find %s", key.c_str());
return NULL; return NULL;
}
} }
void MappingNode::getValue(const std::string &key, bool *b) const void MappingNode::getValue(const std::string &key, bool *b) const
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment