From 660273d4edf231cf4a07e287f65bd8ec7302caba Mon Sep 17 00:00:00 2001 From: elliott_c Date: Wed, 30 Apr 2008 14:22:21 +0000 Subject: ChangeLogTag: Wed Apr 30 14:24:01 UTC 2008 Chad Elliott --- TAO/ATDChangeLog | 6 ++++++ TAO/tao/Transport.cpp | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/TAO/ATDChangeLog b/TAO/ATDChangeLog index 5cfa349af3f..2ff2934da42 100644 --- a/TAO/ATDChangeLog +++ b/TAO/ATDChangeLog @@ -1,3 +1,9 @@ +Wed Apr 30 14:24:01 UTC 2008 Chad Elliott + + * tao/Transport.cpp: + + Replaced the code that scheduled output in post_open(). + Mon Mar 31 15:57:58 UTC 2008 Chad Elliott * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp: diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 03a92f51095..a01dea6a3f5 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -2664,7 +2664,17 @@ TAO_Transport::post_open (size_t id) // If the wait strategy wants us to be registered with the reactor // then we do so. If registeration is required and it succeeds, // #REFCOUNT# becomes two. - if (this->wait_strategy ()->register_handler () != 0) + if (this->wait_strategy ()->register_handler () == 0) + { + TAO_Flushing_Strategy *flushing_strategy = + this->orb_core ()->flushing_strategy (); + + if (flushing_strategy == 0) + throw CORBA::INTERNAL (); + + (void) flushing_strategy->schedule_output (this); + } + else { // Registration failures. -- cgit v1.2.1