diff options
| author | Steve Huston <shuston@riverace.com> | 2012-04-09 22:00:03 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2012-04-09 22:00:03 +0000 |
| commit | 1d4cf5c9c2cce2080549230ec72a32a9f09590cd (patch) | |
| tree | 6b258e4980383cdf51148585f4330420dca2ed8c | |
| parent | fd1841d35760213154cbfa5d31bb006444684a41 (diff) | |
| download | ATCD-1d4cf5c9c2cce2080549230ec72a32a9f09590cd.tar.gz | |
ChangeLogTag:Mon Apr 9 21:57:39 UTC 2012 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/Timer_Queue_T.cpp | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 8fc5234f49b..de5b7e905ae 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Apr 9 21:57:39 UTC 2012 Steve Huston <shuston@riverace.com> + + * ace/Timer_Queue_T.cpp (calculate_timeout): Lock the mutex before + accessing timer queue elements to calculate the timeout. Thanks to + Kannan Ramaswamy for this fix. + Sun Apr 8 14:25:23 UTC 2012 Phil Mesnier <mesnier_p@ociweb.com> * ace/ace.mpc: diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp index e538def8841..0aa4f2904b5 100644 --- a/ACE/ace/Timer_Queue_T.cpp +++ b/ACE/ace/Timer_Queue_T.cpp @@ -120,6 +120,8 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::calculate_timeout (ACE_ if (the_timeout == 0) return 0; + ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, max_wait_time)); + if (this->is_empty ()) { // Nothing on the Timer_Queue, so use whatever the caller gave us. |