ido: Object map should not be static.

diff --git a/lib/ido/dbtype.cpp b/lib/ido/dbtype.cpp
index d283b8abafb9a910ceda44a386962ebeccec07bc..b12b24b70d80e71ffd661619fadef5103ccea142 100644 (file)
--- a/lib/ido/dbtype.cpp
+++ b/lib/ido/dbtype.cpp
@@ -86,13 +86,13 @@ DbObject::Ptr DbType::GetOrCreateObjectByName(const String& name1, const String&
 
        ObjectLock olock(this);
 
-       DbType::ObjectMap::const_iterator it = GetObjects().find(std::make_pair(name1, name2));
+       DbType::ObjectMap::const_iterator it = m_Objects.find(std::make_pair(name1, name2));
 
-       if (it != GetObjects().end())
+       if (it != m_Objects.end())
                return it->second;
 
        DbObject::Ptr dbobj = m_ObjectFactory(GetSelf(), name1, name2);
-       GetObjects()[std::make_pair(name1, name2)] = dbobj;
+       m_Objects[std::make_pair(name1, name2)] = dbobj;
 
        return dbobj;
 }
@@ -111,12 +111,3 @@ DbType::TypeMap& DbType::GetTypes(void)
        static DbType::TypeMap tm;
        return tm;
 }
-
-/**
- * Caller must hold object mutex.
- */
-DbType::ObjectMap& DbType::GetObjects(void)
-{
-       static DbType::ObjectMap om;
-       return om;
-}

diff --git a/lib/ido/dbtype.h b/lib/ido/dbtype.h
index ed0e00cc78bafea5c41c1986b368242c86383c1d..84778429311f17ccbec7ce4075fac1440538c016 100644 (file)
--- a/lib/ido/dbtype.h
+++ b/lib/ido/dbtype.h
@@ -67,7 +67,7 @@ private:
        static boost::mutex& GetStaticMutex(void);
        static TypeMap& GetTypes(void);
 
-       ObjectMap& GetObjects(void);
+       ObjectMap m_Objects;
 };
 
 /**