diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2008-04-30 14:22:21 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2008-04-30 14:22:21 +0000 |
| commit | 660273d4edf231cf4a07e287f65bd8ec7302caba (patch) | |
| tree | 1cf3948f2676a12eccf489314cf07f88564ce362 | |
| parent | b1b07230793924a48e78c2738e35c80d5c29c65e (diff) | |
| download | ATCD-660273d4edf231cf4a07e287f65bd8ec7302caba.tar.gz | |
ChangeLogTag: Wed Apr 30 14:24:01 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ATDChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/Transport.cpp | 12 |
2 files changed, 17 insertions, 1 deletions
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 <elliott_c@ociweb.com> + + * tao/Transport.cpp: + + Replaced the code that scheduled output in post_open(). + Mon Mar 31 15:57:58 UTC 2008 Chad Elliott <elliott_c@ociweb.com> * 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. |