ChangeLogTag: Wed Jul 24 22:30:29 2002 Balachandran Natarajan <bala@cs.wustl.edu>bug_1125_stage_0

6 files changed, 20 insertions, 18 deletions

diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp
index 248427eb9b1..6fca0aa65dd 100644
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ b/TAO/tao/Asynch_Queued_Message.cpp
@@ -166,11 +166,6 @@ TAO_Asynch_Queued_Message::destroy (void)
         {
           delete this;
         }
-
-      // Are these needed? Cannot have them in the destructor since
-      // the ACE_DES_FREE macro first calls the decstructor :(.
-      // this->is_heap_created_ = 0;
-      // this->allocator_ = 0;
     }
 
 }
diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h
index 4f8ba0a1d10..02bd5e7e8d6 100644
--- a/TAO/tao/Asynch_Queued_Message.h
+++ b/TAO/tao/Asynch_Queued_Message.h
@@ -45,7 +45,6 @@ public:
                              ACE_Allocator *alloc = 0);
 
 
-
   /// Destructor
   virtual ~TAO_Asynch_Queued_Message (void);
 
diff --git a/TAO/tao/ChangeLog b/TAO/tao/ChangeLog
index faf97bdbb80..d5332ece1e2 100644
--- a/TAO/tao/ChangeLog
+++ b/TAO/tao/ChangeLog
@@ -1,3 +1,15 @@
+Wed Jul 24 22:30:29 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* tao/Synch_Queued_Message.h:
+	* tao/Synch_Queued_Message.cpp: 
+	* tao/Asynch_Queued_Message.h (TAO_Asynch_Queued_Message): 
+	* tao/Asynch_Queued_Message.cpp: Added comments and spruced up
+	  line spacings.
+
+	* tao/Transport.cpp: Added a debug statement for logging
+	  purposes. 
+	
+
 Mon Jul 22 17:52:04 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/GIOP_Message_Base.cpp: We now use the global pool for
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index 94e94081d2e..c6f62892147 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -163,10 +163,5 @@ TAO_Synch_Queued_Message::destroy (void)
         {
           delete this;
         }
-
-      // Are these needed? Cannot have them in the destructor since
-      // the ACE_DES_FREE macro first calls the decstructor :(.
-      // this->is_heap_created_ = 0;
-      // this->allocator_ = 0;
     }
 }
diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h
index a5644b643e5..d9587fb10d9 100644
--- a/TAO/tao/Synch_Queued_Message.h
+++ b/TAO/tao/Synch_Queued_Message.h
@@ -54,8 +54,6 @@ public:
   TAO_Synch_Queued_Message (const ACE_Message_Block *contents,
                             ACE_Allocator *alloc = 0);
 
-
-
   /// Destructor
   virtual ~TAO_Synch_Queued_Message (void);
 
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index fe3308ef812..6377f1ba14d 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -612,8 +612,14 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb,
 
   ACE_ASSERT (n == 0);
 
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Going to queue and leave \n"));
+  if (TAO_debug_level > 3)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - Transport[%d]::send_reply_message_i, "
+                  "preparing to add to queue before leaving \n",
+                  this->id ()));
+    }
+
   // Till this point we shouldnt have any copying and that is the
   // point anyway. Now, remove the node from the list
   synch_message.remove_from_list (this->head_,
@@ -632,9 +638,6 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb,
 
   (void) flushing_strategy->schedule_output (this);
 
-  // @@todo: Not sure at this point what will happen if the transport
-  // get destroyed in between...
-
   return 1;
 }