Thu Jun 4 10:14:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/Select_Reactor_T.cpp:
          Only call the notify_handler_ when we have a valid pointer

2 files changed, 10 insertions, 2 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index ca9fbdb58c7..d5e17c68a79 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun  4 10:14:05  2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Select_Reactor_T.cpp:
+          Only call the notify_handler_ when we have a valid pointer
+
 Thu Jun  4 09:42:05  2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * contrib/FaCE/CE_ARGV.h:
diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp
index 57f5f9f36bf..30666cbf11f 100644
--- a/ACE/ace/Select_Reactor_T.cpp
+++ b/ACE/ace/Select_Reactor_T.cpp
@@ -211,8 +211,11 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::notify (ACE_Event_Handler *eh,
   // Pass over both the Event_Handler *and* the mask to allow the
   // caller to dictate which Event_Handler method the receiver
   // invokes.  Note that this call can timeout.
-
-  ssize_t const n = this->notify_handler_->notify (eh, mask, timeout);
+  ssize_t n = -1;
+  if (this->notify_handler_)
+    {
+      n = this->notify_handler_->notify (eh, mask, timeout);
+    }
   return n == -1 ? -1 : 0;
 }