diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-06-11 16:50:54 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-06-11 16:50:54 +0000 |
| commit | bc462e98bdad0993430fa0bc24aa5dcbb6670d1b (patch) | |
| tree | 43a229bf08fd06d372a74ab457f2992a328e38fa | |
| parent | 9f664e38d82a89e2f4476c91ca038f5188d9cd95 (diff) | |
| download | ATCD-bc462e98bdad0993430fa0bc24aa5dcbb6670d1b.tar.gz | |
ChangeLogTag: Sun Jun 11 16:46:44 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp | 4 |
4 files changed, 17 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index dee1991cb44..3df49838e64 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Sun Jun 11 16:46:44 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/orbsvcs/EventLog_i.cpp: + * orbsvcs/orbsvcs/NotifyLog_i.cpp: + * orbsvcs/orbsvcs/RTEventLog_i.cpp: + + Changed destructor to invoke destroy() on the event channel. + This notifies suppliers and consumers, and avoids a resource + leak. Fixes bugzilla bug #2559. + Sun Jun 11 00:54:57 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/Log/BasicLog_i.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 8ddb8c08acf..6c6853cf891 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -33,7 +33,9 @@ TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb, TAO_EventLog_i::~TAO_EventLog_i () { - // No-Op. + this->event_channel_->destroy (); + + delete this->event_channel_; } diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index fcea7496a39..db13c800447 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -41,7 +41,7 @@ TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb, TAO_NotifyLog_i::~TAO_NotifyLog_i () { - // No-Op. + this->event_channel_->destroy (); } DsLogAdmin::Log_ptr diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index 2192700623e..3aacac1ff86 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -42,7 +42,9 @@ TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb, TAO_RTEventLog_i::~TAO_RTEventLog_i () { - // No-Op. + this->event_channel_->destroy (); + + delete this->event_channel_; } |