1 files changed, 6 insertions, 2 deletions
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index fe6007fc1de..94e94081d2e 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -20,8 +20,7 @@ TAO_Synch_Queued_Message::
 
 TAO_Synch_Queued_Message::~TAO_Synch_Queued_Message (void)
 {
-  this->is_heap_created_ = 0;
-  this->allocator_ = 0;
+
 }
 
 const ACE_Message_Block *
@@ -164,5 +163,10 @@ 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;
     }
 }