Changeset 2082 for code/branches/objecthierarchy/src/core/Event.cc

Timestamp:

Nov 1, 2008, 1:48:57 PM (17 years ago)

Author:

landauf

Message:

• simplified some event code
• prevents infinite event loops
• fixed some leaky memory behavior in XMLPort and EventIncludes

File:

• code/branches/objecthierarchy/src/core/Event.cc (modified) (2 diffs)

code/branches/objecthierarchy/src/core/Event.cc

@@ -38 +38 @@
     }
 
-    void EventContainer::process(void* object, const Event& event)
+    void EventContainer::process(BaseObject* object, const Event& event)
     {
+        if (this->bActive_)
+        {
+            COUT(2) << "Warning: Detected Event loop in section \"" << this->eventname_ << "\" of object \"" << object->getName() << "\" and fired by \"" << event.originator_->getName() << "\"" << std::endl;
+            return;
+        }
+
+        this->bActive_ = true;
+
         if (this->eventname_ == event.sectionname_)
         {
@@ -65 +73 @@
             }
         }
+
+        this->bActive_ = false;
     }
 }