summaryrefslogtreecommitdiff
path: root/ACE/ace/WFMO_Reactor.inl
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/ace/WFMO_Reactor.inl')
-rw-r--r--ACE/ace/WFMO_Reactor.inl2
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ace/WFMO_Reactor.inl b/ACE/ace/WFMO_Reactor.inl
index d2e8d56bdba..eb81e727a5f 100644
--- a/ACE/ace/WFMO_Reactor.inl
+++ b/ACE/ace/WFMO_Reactor.inl
@@ -499,7 +499,7 @@ ACE_WFMO_Reactor::cancel_timer (ACE_Event_Handler *handler,
int dont_call_handle_close)
{
ACE_TRACE ("ACE_WFMO_Reactor::cancel_timer");
- if (0 != this->timer_queue_)
+ if ((0 != this->timer_queue_) && (0 != handler))
return this->timer_queue_->cancel (handler, dont_call_handle_close);
return 0;
}