Git commit fixes

This commit is contained in:
Dmitry Rubashkin 2019-07-23 13:31:20 +03:00 committed by dimarub2000
parent 4d43cf2a8d
commit 13ef987361

View File

@ -211,7 +211,7 @@ void ConfigProcessor::mergeRecursive(XMLDocumentPtr config, Node * config_root,
void ConfigProcessor::merge(XMLDocumentPtr config, XMLDocumentPtr with)
{
Node * config_root = getRootNode(&*config);
const Node * with_root = getRootNode(&*with);
Node * with_root = getRootNode(&*with);
if (config_root->nodeName() != with_root->nodeName())
throw Poco::Exception("Root element doesn't have the corresponding root element as the config file. It must be <" + config_root->nodeName() + ">");