ChangeLogTag:Tue Sep 10 12:28:41 2002 Carlos O'Ryan <coryan@atdesk.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index 1fb8aa40285..4fa33680fa2 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -302,6 +302,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::handle_input (ACE_HANDLE h)
 
   if (this->cleanup_AST (h, ast) != -1)
     {
+      ACE_ASSERT (ast != 0);
       ast->svc_handler ()->close (0);
       delete ast;
     }
@@ -548,7 +549,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::cancel (SVC_HANDLER *sh)
     if (me->int_id_->svc_handler () == sh)
       {
         AST *ast = 0;
-        this->cleanup_AST (me->ext_id_, ast);
+        (void) this->cleanup_AST (me->ext_id_, ast);
         delete ast;
         return 0;
       }
@@ -665,10 +666,14 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::handle_close (ACE_HANDLE, ACE_
 
           // Clean it up.
           AST *ast = 0;
-          this->cleanup_AST (handle, ast);
+          int r = this->cleanup_AST (handle, ast);
 
           // Close the svc_handler.
-          ast->svc_handler ()->close (0);
+          if (r != -1)
+            {
+              ACE_ASSERT (ast != 0);
+              ast->svc_handler ()->close (0);
+            }
 
           // Zap the ast.
           delete ast;