diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/Connection_Handler.cpp | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a6986b58328..b7ddc1a167c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Apr 12 14:12:55 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Connection_Handler.cpp: + Get the reactor from the event handler + Tue Apr 12 12:47:58 UTC 2011 Phil Mesnier <mesnier_p@ociweb.com> * tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp: diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index 68b97da4b7f..db3e58119ae 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -239,9 +239,14 @@ TAO_Connection_Handler::handle_input_eh (ACE_HANDLE h, ACE_Event_Handler *eh) eh->get_handle()), -1); - this->orb_core_->reactor()->schedule_timer (prhd, - 0, - suspend_delay); + ACE_Reactor * reactor = eh->reactor (); + + if (reactor == 0) + { + reactor = this->orb_core_->reactor(); + } + + reactor->schedule_timer (prhd, 0, suspend_delay); // Returning 0 causes the wait strategy to exit and the leader thread // to enter the reactor's select() call. |