diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-11 11:58:35 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-11 11:58:35 +0000 |
| commit | 39b9378155f64593150ddbae7d8e409169378a3c (patch) | |
| tree | 3c20f4b6a572228a9efd3de776c520393a1343c8 /ACE/ace/Select_Reactor_T.cpp | |
| parent | 4cd48f14cdc01606197bf9ca20fe97c5efe45e34 (diff) | |
| download | ATCD-39b9378155f64593150ddbae7d8e409169378a3c.tar.gz | |
Mon Oct 11 11:53:43 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Dev_Poll_Reactor.cpp:
* ace/Select_Reactor_T.cpp:
Fixed problems with threads=0, thanks to Elez <elezsh at gmail dot com>
for reporting this and providing a patch
Diffstat (limited to 'ACE/ace/Select_Reactor_T.cpp')
| -rw-r--r-- | ACE/ace/Select_Reactor_T.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp index 4d6582662d9..eb78e04825b 100644 --- a/ACE/ace/Select_Reactor_T.cpp +++ b/ACE/ace/Select_Reactor_T.cpp @@ -1392,14 +1392,14 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handle_events (ACE_Time_Value *max_wait_time) { ACE_TRACE ("ACE_Select_Reactor_T::handle_events"); - -#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) - + // Stash the current time -- the destructor of this object will // automatically compute how much time elapsed since this method was // called. ACE_Countdown_Time countdown (max_wait_time); +#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) + ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1); if (ACE_OS::thr_equal (ACE_Thread::self (), |