diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-07 15:58:41 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-07 15:58:41 +0000 |
| commit | f903ab3c35daf861d6a22b9bd7d7d6ec4c8dc0db (patch) | |
| tree | 1722e664f520299bce1ff5094828d35a5677cf3a | |
| parent | 9510902d50275fdb959391f7dbddf51f2a503d47 (diff) | |
| download | ATCD-f903ab3c35daf861d6a22b9bd7d7d6ec4c8dc0db.tar.gz | |
Mon Jun 07 10:43:12 1999 Irfan Pyarali <irfan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 7 | ||||
| -rw-r--r-- | TAO/tao/default_resource.cpp | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 484171ad40c..b80fc70a3cc 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,10 @@ +Mon Jun 07 10:43:12 1999 Irfan Pyarali <irfan@cs.wustl.edu> + + * tao/default_resource.cpp (TAO_Allocated_Resources): Moved the + destruction of the Reactor before the destruction of the + allocators. The handlers deleted when the Reactors die access + these allocators. Thanks to Carlos for helping with this. + Mon Jun 7 01:11:06 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * examples/POA/DSI/client.cpp (main): Corrected an overly diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index d6f302f13bb..10d44e7f063 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -557,6 +557,11 @@ TAO_Allocated_Resources::TAO_Allocated_Resources (void) TAO_Allocated_Resources::~TAO_Allocated_Resources (void) { + // The destruction of the Reactor must come before the destruction + // of the allocators. The handlers deleted when the Reactors die + // access these allocators. + delete this->r_; + if (this->input_cdr_dblock_allocator_ != 0) this->input_cdr_dblock_allocator_->remove (); delete this->input_cdr_dblock_allocator_; @@ -572,8 +577,6 @@ TAO_Allocated_Resources::~TAO_Allocated_Resources (void) if (this->output_cdr_buffer_allocator_ != 0) this->output_cdr_buffer_allocator_->remove (); delete this->output_cdr_buffer_allocator_; - - delete this->r_; } // **************************************************************** |