Changeset 7536

Timestamp:

Feb 5, 2010, 9:46:33 AM (14 years ago)

Author:

Christoph Mayer

Message:

-timer shutdown fix, -bootstrap module shutdown fix

Location:

source/ariba/utility

Files:

• bootstrap/BootstrapManager.cpp (modified) (1 diff)
• system/Timer.cpp (modified) (2 diffs)

source/ariba/utility/bootstrap/BootstrapManager.cpp

@@ -111 +111 @@
 
         ModuleMap::iterator i = modules.find(type);
-        if( i != modules.end() ) return RegistrationFailed;
+        if( i == modules.end() ) return RegistrationFailed;
 
         BootstrapModule* module = i->second;

source/ariba/utility/system/Timer.cpp

@@ -55 +55 @@
 Timer::~Timer() {
 #ifndef UNDERLAY_OMNET
-        if( running ){
-                running = false;
-
-                timerThread->join();
-                delete timerThread;
-                timerThread = NULL;
-        }
+        stop();
+        delete timerThread;
+        timerThread = NULL;
 #endif // UNDERLAY_OMNET
 }
@@ -101 +97 @@
         reset(); // cause the sleep to abort
         SystemQueue::instance().dropAll(this);
+        timerThread->join();
 }