Fix validation problem with relative object names.

Refs #5925

diff --git a/lib/config/aexpression.cpp b/lib/config/aexpression.cpp
index f8c8777819a1263f43bbb3b2175ff7ac69915c52..46e81490279a7309da6b01525dba450ff8cb4cf7 100644 (file)
--- a/lib/config/aexpression.cpp
+++ b/lib/config/aexpression.cpp
@@ -522,12 +522,23 @@ Value AExpression::OpObject(const AExpression* expr, const Dictionary::Ptr& loca
 
        ConfigItemBuilder::Ptr item = make_shared<ConfigItemBuilder>(expr->m_DebugInfo);
 
-       ConfigItem::Ptr oldItem = ConfigItem::GetObject(type, name);
+       String checkName = name;
 
-       if (oldItem) {
-               std::ostringstream msgbuf;
-               msgbuf << "Object '" << name << "' of type '" << type << "' re-defined: " << expr->m_DebugInfo << "; previous definition: " << oldItem->GetDebugInfo();
-               BOOST_THROW_EXCEPTION(ConfigError(msgbuf.str()) << errinfo_debuginfo(expr->m_DebugInfo));
+       if (!abstract) {
+               const DynamicObjectNameHelper *nh = dynamic_cast<const DynamicObjectNameHelper *>(Type::GetByName(type));
+
+               if (nh)
+                       checkName = nh->MakeObjectName(name, Dictionary::Ptr());
+       }
+
+       if (!checkName.IsEmpty()) {
+               ConfigItem::Ptr oldItem = ConfigItem::GetObject(type, name);
+
+               if (oldItem) {
+                       std::ostringstream msgbuf;
+                       msgbuf << "Object '" << name << "' of type '" << type << "' re-defined: " << expr->m_DebugInfo << "; previous definition: " << oldItem->GetDebugInfo();
+                       BOOST_THROW_EXCEPTION(ConfigError(msgbuf.str()) << errinfo_debuginfo(expr->m_DebugInfo));
+               }
        }
 
        item->SetType(type);