Register type objects as global variables

fixes #8019

diff --git a/lib/base/type.cpp b/lib/base/type.cpp
index e1e933678c5183160e5f624d5f90f5679fdb3310..1ca108cd79390ead4aade758e84b8a6225c66014 100644 (file)
--- a/lib/base/type.cpp
+++ b/lib/base/type.cpp
@@ -18,33 +18,30 @@
  ******************************************************************************/
 
 #include "base/type.hpp"
+#include "base/scriptvariable.hpp"
 
 using namespace icinga;
 
-Type::TypeMap& Type::GetTypes(void)
-{
-       static TypeMap types;
-
-       return types;
-}
-
 void Type::Register(const Type::Ptr& type)
 {
        VERIFY(GetByName(type->GetName()) == NULL);
 
-       GetTypes()[type->GetName()] = type;
+       ScriptVariable::Set(type->GetName(), type, true, true);
 }
 
 Type::Ptr Type::GetByName(const String& name)
 {
-       std::map<String, Type::Ptr>::const_iterator it;
+       ScriptVariable::Ptr svtype = ScriptVariable::GetByName(name);
+
+       if (!svtype)
+               return Type::Ptr();
 
-       it = GetTypes().find(name);
+       Value ptype = svtype->GetData();
 
-       if (it == GetTypes().end())
+       if (!ptype.IsObjectType<Type>())
                return Type::Ptr();
 
-       return it->second;
+       return ptype;
 }
 
 Object::Ptr Type::Instantiate(void) const

diff --git a/lib/base/type.hpp b/lib/base/type.hpp
index 2ae18547892b6914bcfbdf38b1a42207bd44aa9c..0654113615bb54cfa985c11efd0c355dcd092636 100644 (file)
--- a/lib/base/type.hpp
+++ b/lib/base/type.hpp
@@ -78,11 +78,6 @@ public:
 
 protected:
        virtual ObjectFactory GetFactory(void) const = 0;
-
-private:
-       typedef std::map<String, Type::Ptr> TypeMap;
-
-       static TypeMap& GetTypes(void);
 };
 
 template<typename T>