Avoid using ConfigItem::GetObject when possible.

Refs #5327

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 4dc6eae7ec790c58900696f7d34781c99d9fc915..e9756141d5fc29ddef63331c6787e7030e9b102c 100644 (file)
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -219,6 +219,17 @@ ConfigItem::Ptr ConfigItem::GetObject(const String& type, const String& name)
        return ConfigItem::Ptr();
 }
 
+bool ConfigItem::HasObject(const String& type, const String& name)
+{
+       boost::mutex::scoped_lock lock(m_Mutex);
+
+       ConfigItem::ItemMap::iterator it;
+
+       it = m_Items.find(std::make_pair(type, name));
+
+       return (it != m_Items.end());
+}
+
 void ConfigItem::ValidateItem(void)
 {
        if (m_Validated)

diff --git a/lib/config/configitem.h b/lib/config/configitem.h
index b16353f671b88ae525fe1f9568b0fbe2b13a9907..8adf4b6b816fe38799a856d6ec6b6a286e384eb0 100644 (file)
--- a/lib/config/configitem.h
+++ b/lib/config/configitem.h
@@ -58,6 +58,7 @@ public:
 
        static ConfigItem::Ptr GetObject(const String& type,
            const String& name);
+       static bool HasObject(const String& type, const String& name);
 
        void ValidateItem(void);
 

diff --git a/lib/config/typerule.cpp b/lib/config/typerule.cpp
index 0cb58cb97886f22d6bfb51af80be6df893aff6c3..6f45ef8a118b5d3b2b71da7e768698fe0e3febd4 100644 (file)
--- a/lib/config/typerule.cpp
+++ b/lib/config/typerule.cpp
@@ -45,8 +45,6 @@ bool TypeRule::MatchName(const String& name) const
 
 bool TypeRule::MatchValue(const Value& value, String *hint) const
 {
-       ConfigItem::Ptr item;
-
        if (value.IsEmpty())
                return true;
 
@@ -78,9 +76,7 @@ bool TypeRule::MatchValue(const Value& value, String *hint) const
                        if (!value.IsScalar())
                                return false;
 
-                       item = ConfigItem::GetObject(m_NameType, value);
-
-                       if (!item) {
+                       if (!ConfigItem::HasObject(m_NameType, value)) {
                                *hint = "Object '" + value + "' of type '" + m_NameType + "' does not exist.";
                                return false;
                        }