An Overlay-based
Virtual Network Substrate
SpoVNet

Changeset 7536 for source


Ignore:
Timestamp:
Feb 5, 2010, 9:46:33 AM (9 years ago)
Author:
Christoph Mayer
Message:

-timer shutdown fix, -bootstrap module shutdown fix

Location:
source/ariba/utility
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • source/ariba/utility/bootstrap/BootstrapManager.cpp

    r7532 r7536  
    111111
    112112        ModuleMap::iterator i = modules.find(type);
    113         if( i != modules.end() ) return RegistrationFailed;
     113        if( i == modules.end() ) return RegistrationFailed;
    114114
    115115        BootstrapModule* module = i->second;
  • source/ariba/utility/system/Timer.cpp

    r7533 r7536  
    5555Timer::~Timer() {
    5656#ifndef UNDERLAY_OMNET
    57         if( running ){
    58                 running = false;
    59 
    60                 timerThread->join();
    61                 delete timerThread;
    62                 timerThread = NULL;
    63         }
     57        stop();
     58        delete timerThread;
     59        timerThread = NULL;
    6460#endif // UNDERLAY_OMNET
    6561}
     
    10197        reset(); // cause the sleep to abort
    10298        SystemQueue::instance().dropAll(this);
     99        timerThread->join();
    103100}
    104101
Note: See TracChangeset for help on using the changeset viewer.