diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2008-04-09 01:28:18 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2008-04-09 01:28:18 +0000 |
| commit | 11a64b4a99aa69891e1732080e00ac0751b1510e (patch) | |
| tree | 5861e191aa746fcb141be8fcf59e83a512e54e06 | |
| parent | 0797e25b077a9a07fa2662adb266bfecb14eb54a (diff) | |
| download | ATCD-11a64b4a99aa69891e1732080e00ac0751b1510e.tar.gz | |
ChangeLogTag:Wed
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/Condition_T.cpp | 11 | ||||
| -rw-r--r-- | CIAO/ChangeLog | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 948cdc6cadd..4c861c3487f 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Wed Apr 9 01:21:42 UTC 2008 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Condition_T.cpp (wait): Fixed a bug where the mutex + parameter wasn't being used properly if abstime was 0. Thanks + to Andriy Gapon <avg at icyb dot net dot ua> for reporting this. + Mon Apr 7 18:49:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/docs/templates/gnu.txt: diff --git a/ACE/ace/Condition_T.cpp b/ACE/ace/Condition_T.cpp index fa0dab4e80a..e4931ce442e 100644 --- a/ACE/ace/Condition_T.cpp +++ b/ACE/ace/Condition_T.cpp @@ -96,13 +96,12 @@ ACE_Condition<MUTEX>::wait (MUTEX &mutex, { // ACE_TRACE ("ACE_Condition<MUTEX>::wait"); if (abstime == 0) - return this->wait (); + return ACE_OS::cond_wait (&this->cond_, + &mutex.lock_); else - { - return ACE_OS::cond_timedwait (&this->cond_, - &mutex.lock_, - (ACE_Time_Value *) abstime); - } + return ACE_OS::cond_timedwait (&this->cond_, + &mutex.lock_, + (ACE_Time_Value *) abstime); } // Peform an "alertable" timed wait. If the argument ABSTIME == 0 diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index f32b7a031be..579844d5580 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -20,7 +20,7 @@ Wed Mar 26 15:27:44 UTC 2008 Adam Mitz <mitza@ociweb.com> Mon Mar 24 02:25:23 UTC 2008 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * COPYING: Updated the license a bit based on feedback from Tom - Callaway" <tcallawa at redhat dot com>. These changes will + Callaway <tcallawa at redhat dot com>. These changes will enable ACE+TAO to be shipped with Fedora. Sun Mar 23 01:55:11 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> |