3 files changed, 7 insertions, 7 deletions
diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp
index 87d9469d11f..42e63e7526c 100644
--- a/TAO/tao/IIOP_Connect.cpp
+++ b/TAO/tao/IIOP_Connect.cpp
@@ -520,10 +520,11 @@ TAO_IIOP_Client_Connection_Handler::handle_cleanup (void)
       this->reactor ()->cancel_timer (this);
     }
 
-  this->peer ().close ();
-
   // Now do the decerment of the ref count
   this->decr_ref_count ();
+
+  // Close the socket
+  this->peer ().close ();
   return 0;
 }
 
diff --git a/TAO/tao/SHMIOP_Connect.cpp b/TAO/tao/SHMIOP_Connect.cpp
index 442171a1a1f..ad649b09a93 100644
--- a/TAO/tao/SHMIOP_Connect.cpp
+++ b/TAO/tao/SHMIOP_Connect.cpp
@@ -474,11 +474,10 @@ TAO_SHMIOP_Client_Connection_Handler::handle_cleanup (void)
       this->reactor ()->cancel_timer (this);
     }
 
-  this->peer ().close ();
-
-  // Now do the decerment of the ref count
+  // Now do the decrement of the ref count
   this->decr_ref_count ();
 
+  this->peer ().close ();
   return 0;
 }
 
diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp
index 69080ae8922..541181a9dc7 100644
--- a/TAO/tao/UIOP_Connect.cpp
+++ b/TAO/tao/UIOP_Connect.cpp
@@ -481,10 +481,10 @@ TAO_UIOP_Client_Connection_Handler::handle_cleanup (void)
       this->reactor ()->cancel_timer (this);
     }
 
-  this->peer ().close ();
-
   // Now do the decerment of the ref count
   this->decr_ref_count ();
+
+  this->peer ().close ();
   return 0;
 }