Changeset 10510 for trunk/FACT++

Timestamp:

05/02/11 19:04:13 (14 years ago)

Author:

tbretz

Message:

Moved exit handler to DimErrorRedirecter.

Location:

trunk/FACT++/src

Files:

• StateMachineDim.cc (modified) (1 diff)
• StateMachineDim.h (modified) (1 diff)

trunk/FACT++/src/StateMachineDim.cc

@@ -76 +76 @@
     //    fSrvVersion((name+"/VERSION").c_str(), const_cast<int&>(fVersion)),
 {
-    // WARNING: This exit handler is GLOBAL!
-    DimServer::addExitHandler(this);
     SetDefaultStateNames();
 }

trunk/FACT++/src/StateMachineDim.h

@@ -20 +20 @@
     DimStart(const std::string &name, MessageImp &imp) : DimErrorRedirecter(imp)
     {
-        DimServer::addErrorHandler(this);
         DimServer::start(name.c_str());
     }
-    ~DimStart() { DimServer::stop(); }
+    ~DimStart()
+    {
+        DimServer::stop();
+    }
 };
 
-class StateMachineDim : public DimCommandHandler, public DimExitHandler, public StateMachine, public DimStart
+class StateMachineDim : public DimCommandHandler, public StateMachine, public DimStart
 {
 private: