diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-02-15 16:25:00 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-02-15 16:25:00 +0000 |
| commit | e6361a34787703ae88cde6d1bcefe957445cb2cb (patch) | |
| tree | 07d3270528dbd2d04ea7d512ecb2bdc9c3c0574e | |
| parent | 7cd3387be132b2e8bcdd94e1a2c769ddd5f58ebd (diff) | |
| download | ATCD-e6361a34787703ae88cde6d1bcefe957445cb2cb.tar.gz | |
ChangeLogTag:Tue Feb 15 10:23:39 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | examples/Service_Configurator/Misc/Timer_Service.cpp | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 17060e57c1c..ca2d0b1ae51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Feb 15 10:23:39 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu> + + * examples/Service_Configurator/Misc/Timer_Service.cpp (handle_close): + Make sure to cancel the timer when we're done. Thanks to Scott + Z <sz@finsatconsulting.com> for reporting this. + Tue Feb 15 11:11:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * ace/ACE.h: @@ -1953,6 +1953,7 @@ YiQing Xiong <xjaguar at 126 dot com> Peter Falsh <webangel at list dot ru> Don Sharp <dws at prismtech dot com> Arto Jalkanen <ajalkane at gmail dot com> +Scott Z <sz at finsatconsulting dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/examples/Service_Configurator/Misc/Timer_Service.cpp b/examples/Service_Configurator/Misc/Timer_Service.cpp index c69b448aebc..82ace8f657c 100644 --- a/examples/Service_Configurator/Misc/Timer_Service.cpp +++ b/examples/Service_Configurator/Misc/Timer_Service.cpp @@ -100,6 +100,9 @@ Timer_Service_1::handle_close (ACE_HANDLE, { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("closing down the timer test\n"))); + // Remove ourselves from the timer queue. + ACE_Reactor::instance ()->cancel_timer (this); + ACE_Reactor::end_event_loop(); return 0; } |