summaryrefslogtreecommitdiff
path: root/TAO/tao/Strategies/SHMIOP_Transport.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Strategies/SHMIOP_Transport.cpp')
-rw-r--r--TAO/tao/Strategies/SHMIOP_Transport.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index 64fbe74061f..c0d1c755723 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -247,10 +247,10 @@ TAO_SHMIOP_Transport::send_message (TAO_OutputCDR &stream,
// versions seem to need it though. Leaving it costs little.
// This guarantees to send all data (bytes) or return an error.
- ssize_t n = this->send_message_i (stub,
- twoway,
- stream.begin (),
- max_wait_time);
+ ssize_t n = this->send_message_shared (stub,
+ twoway,
+ stream.begin (),
+ max_wait_time);
if (n == -1)
{
@@ -276,10 +276,12 @@ TAO_SHMIOP_Transport::messaging_init (CORBA::Octet major,
return 1;
}
-void
-TAO_SHMIOP_Transport::transition_handler_state_i (void)
+ACE_Event_Handler *
+TAO_SHMIOP_Transport::invalidate_event_handler_i (void)
{
- connection_handler_ = 0;
+ ACE_Event_Handler * eh = this->connection_handler_;
+ this->connection_handler_ = 0;
+ return eh;
}
#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */