diff options
Diffstat (limited to 'TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp')
| -rw-r--r-- | TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp index 47961e5db40..fca4ecc35f5 100644 --- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp +++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp @@ -214,7 +214,7 @@ TAO_DIOP_Connection_Handler::activate (long flags, // @@ Frank: Not disabled yet... // Set the id in the transport now that we're active. - this->transport ()->id ((int) this->get_handle ())); + this->transport ()->id ((int) this->get_handle ()); return TAO_DIOP_SVC_HANDLER::activate (flags, n_threads, @@ -266,20 +266,22 @@ TAO_DIOP_Connection_Handler::handle_close (ACE_HANDLE handle, rm)); --this->pending_upcalls_; - if (this->pending_upcalls_ == 0 && - this->is_registered ()) + if (this->pending_upcalls_ == 0) { - // @@ Frank: Added reactor check. not sure if this is right? - if (this->reactor ()) - { - // Make sure there are no timers. - this->reactor ()->cancel_timer (this); - } - - // Set the flag to indicate that it is no longer registered with - // the reactor, so that it isn't included in the set that is - // passed to the reactor on ORB destruction. - this->is_registered (0); + if (this->is_registered ()) + { + // @@ Frank: Added reactor check. not sure if this is right? + if (this->reactor ()) + { + // Make sure there are no timers. + this->reactor ()->cancel_timer (this); + } + + // Set the flag to indicate that it is no longer registered with + // the reactor, so that it isn't included in the set that is + // passed to the reactor on ORB destruction. + this->is_registered (0); + } // Close the handle.. if (this->get_handle () != ACE_INVALID_HANDLE) |