diff options
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/LF_Connect_Strategy.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Reactive_Connect_Strategy.cpp | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp index 69e7e3ddbcd..698ade4f464 100644 --- a/TAO/tao/LF_Connect_Strategy.cpp +++ b/TAO/tao/LF_Connect_Strategy.cpp @@ -71,7 +71,7 @@ TAO_LF_Connect_Strategy::wait (TAO_Connection_Handler *ch, } TAO_Leader_Follower &leader_follower = - transport->orb_core ()->leader_follower (); + this->orb_core_->leader_follower (); int result = leader_follower.wait_for_event (ch, diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp index f089853141c..7d3af7b322f 100644 --- a/TAO/tao/Reactive_Connect_Strategy.cpp +++ b/TAO/tao/Reactive_Connect_Strategy.cpp @@ -47,19 +47,15 @@ TAO_Reactive_Connect_Strategy::wait (TAO_Connection_Handler *ch, ACE_LIB_TEXT ("(%P|%t) Waiting in the Reactor for") ACE_LIB_TEXT (" connection completion - wait () \n"))); - TAO_Transport *transport = - ch->transport (); - int result = 0; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - TAO_ORB_Core *orb_core = transport->orb_core (); - while (ch->keep_waiting ()) { - result = orb_core->run (max_wait_time, 1 ACE_ENV_ARG_PARAMETER); + result = + this->orb_core_->run (max_wait_time, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Did we timeout? If so, stop running the loop. |