--- Connection_Handler.cpp.orig	Thu May 21 11:03:37 2009
+++ Connection_Handler.cpp	Thu May 21 11:04:18 2009
@@ -440,21 +440,10 @@
   this->state_changed (TAO_LF_Event::LFS_CONNECTION_CLOSED,
                        this->orb_core_->leader_follower ());
 
-  // Save these for later.  It's possible that purge_entry() called on
-  // the transport could cause our own death.
-  bool pending = this->connection_pending_;
   TAO_Transport* transport = this->transport ();
-
-  // After calling this, it is unsafe to assume that this object has
-  // *NOT* been deleted!  Only if pending is true are we still around.
   transport->purge_entry();
+  transport->remove_reference ();
 
-  // We only need to remove the reference from the transport if there
-  // were connections pending at the time that the handler is closed or
-  // the handler is being closed during a new connection.
-  if (pending || ACE_BIT_DISABLED(flags, CLOSE_DURING_NEW_CONNECTION))
-    transport->remove_reference ();
-
   return 0;
 }