summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcbeaulac <cbeaulac@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-04-19 14:46:38 +0000
committercbeaulac <cbeaulac@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-04-19 14:46:38 +0000
commitcec172abb326be14f96ebf06a1ae48eee91c3e48 (patch)
tree965c420e08b8bd9ef0d56b18543dc89c26c0b591
parent2bcb494e09c0cac56421d3cec47df44e09c1cc9e (diff)
downloadATCD-cec172abb326be14f96ebf06a1ae48eee91c3e48.tar.gz
Mon Apr 19 14:43:39 UTC 2010 Chad Beaulac <chad@objectivesolutions.com>
* examples/ASX/CCM_App/SC_Server.cpp Removed ACE_Sig_Adapter shutdown_handler. This was causing a bus error at application termination. It is also unnecessary because the STDIN handler is taking care of shutdown upon a CTRL-C. This fixes Bugzilla #2916 and #3205
-rw-r--r--ChangeLog10
-rw-r--r--examples/ASX/CCM_App/SC_Server.cpp8
2 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 332f1f869b4..a8869ad342f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Apr 19 14:43:39 UTC 2010 Chad Beaulac <chad@objectivesolutions.com>
+
+ * examples/ASX/CCM_App/SC_Server.cpp
+ Removed ACE_Sig_Adapter shutdown_handler.
+ This was causing a bus error at application termination.
+ It is also unnecessary because the STDIN handler
+ is taking care of shutdown upon a CTRL-C.
+
+ This fixes Bugzilla #2916 and #3205
+
Fri Apr 16 13:02:04 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Atomic_Op.h:
diff --git a/examples/ASX/CCM_App/SC_Server.cpp b/examples/ASX/CCM_App/SC_Server.cpp
index 4a1256cf7f4..c2e644fe2b4 100644
--- a/examples/ASX/CCM_App/SC_Server.cpp
+++ b/examples/ASX/CCM_App/SC_Server.cpp
@@ -54,7 +54,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
ACE_Service_Config loggerd;
Event_Handler handler;
- ACE_Sig_Adapter shutdown_handler ((ACE_Sig_Handler_Ex) ACE_Reactor::end_event_loop);
if (ACE_Event_Handler::register_stdin_handler (&handler,
ACE_Reactor::instance (),
@@ -72,13 +71,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_TEXT ("%p\n%a"),
ACE_TEXT ("open"),
1));
- else if (ACE_Reactor::instance ()->register_handler
- (SIGINT, &shutdown_handler) == -1)
- ACE_ERROR ((LM_ERROR,
- ACE_TEXT ("%p\n%a"),
- ACE_TEXT ("register_handler"),
- 1));
-
// Perform logging service until we receive SIGINT.
ACE_Reactor::instance ()->run_reactor_event_loop ();