diff options
| author | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-15 06:48:01 +0000 |
|---|---|---|
| committer | dai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-11-15 06:48:01 +0000 |
| commit | 5074edea5a8c1d5cf1e1508d80afa9d43f7ea8b6 (patch) | |
| tree | 5833c88f675f5c225978bfeb9716e1ac877f13b1 | |
| parent | 15c2afa4927017f9c189a72818f7b167bd15f08d (diff) | |
| download | ATCD-5074edea5a8c1d5cf1e1508d80afa9d43f7ea8b6.tar.gz | |
Mon Nov 14 23:37:09 USMST 2005 Yan Dai <dai_y@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp | 1 | ||||
| -rw-r--r-- | TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp | 1 | ||||
| -rw-r--r-- | TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp | 1 |
5 files changed, 13 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ad110465bf6..7340bd9fc2b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Mon Nov 14 23:37:09 USMST 2005 Yan Dai <dai_y@ociweb.com> + + * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp: + * examples/CSD_Strategy/ThreadPool4/Foo_i.cpp: + * examples/CSD_Strategy/ThreadPool5/Foo_i.cpp: + * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp: + + Fixed memory leaks. + Mon Nov 14 13:54:08 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * orbsvcs/orbsvcs/Makefile.am (libTAO_PortableGroup_la_SOURCES): diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp index 0b9519f02c9..ad128eb15d6 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp @@ -92,6 +92,7 @@ ACE_THROW_SPEC (( { ACE_CString str(message); str += user_name; + CORBA::string_free (message); message = CORBA::string_dup (str.c_str ()); return 1; } diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp index 2aeaf260da4..dd4f1c9821a 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp @@ -97,6 +97,7 @@ ACE_THROW_SPEC (( { ACE_CString str(message); str += user_name; + CORBA::string_free (message); message = CORBA::string_dup (str.c_str ()); return 1; } diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp index 6304af0d3a4..8d4f86f84ce 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp @@ -41,6 +41,7 @@ TAO::CSD::FW_Server_Request_Wrapper::~FW_Server_Request_Wrapper() { char* opname = (char*)this->request_->operation_details_->opname_; delete [] opname; + delete this->request_->operation_details_; } delete this->request_; } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp index c7e648bb2af..0fc1f37b12e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp @@ -75,6 +75,7 @@ Foo_B_i::op6(const TimeOfDay& t, this->op_count_[5] ++; char buf [20]; ACE_OS::sprintf (buf, "%s %d:%d:%d", message, t.hour, t.minute, t.second); + CORBA::string_free (message); message = CORBA::string_dup (buf); return 1; |