ChangeLogTag: Fri Apr 27 04:07:00 2001 Michael Kircher <Michael.Kircher@mchp.siemens.de>

3 files changed, 21 insertions, 6 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index eb83c9436e9..ce660a7417a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -5,6 +5,10 @@ Fri Apr 27 04:07:00 2001  Michael Kircher <Michael.Kircher@mchp.siemens.de>
 	  Fixed the send method, as it used not the right handle to send 
 	  its data.
 
+	* examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp:
+	 
+	  Fixed code to remove connection handlers.
+
 Thu Apr 26 22:21:26 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
         * tests/IDL_Test/interface.idl:
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp
index 9c7cf55d9cf..6b13dfac9d4 100644
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp
+++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp
@@ -207,8 +207,14 @@ TAO_DIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
 int
 TAO_DIOP_Acceptor::close (void)
 {
-  delete this->connection_handler_;
-  this->connection_handler_ = 0;
+  if (this->connection_handler_)
+    {
+      // This will trigger that the connection handler gets deleted.
+      this->orb_core_->reactor ()->remove_handler (this->connection_handler_,
+                                                   ACE_Event_Handler::READ_MASK);
+
+      this->connection_handler_ = 0;
+    }
   return 0;
 }
 
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp
index bed3fa5b098..f890ca85027 100644
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp
+++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp
@@ -70,14 +70,19 @@ TAO_DIOP_Transport::messaging_object (void)
 ssize_t
 TAO_DIOP_Transport::send_i (iovec *iov, int iovcnt,
                             size_t &bytes_transferred,
-                            const ACE_Time_Value *max_wait_time)
+                            const ACE_Time_Value *)
 {
-  ssize_t retval = this->connection_handler_->peer ().sendv (iov, iovcnt,
-                                                             max_wait_time);
+  const ACE_INET_Addr &addr = this->connection_handler_->addr ();
+  ssize_t retval = this->connection_handler_->dgram ().send (iov, 
+                                                             iovcnt,
+                                                             addr);
   if (retval > 0)
     bytes_transferred = retval;
 
-  return retval;
+  // @@ Michael:
+  // Always return a positive number of bytes sent, as we do
+  // not handle sending errors in DIOP.
+  return 1;
 }
 
 ssize_t