diff options
| author | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-12-29 16:39:27 +0000 |
|---|---|---|
| committer | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-12-29 16:39:27 +0000 |
| commit | f208d4646a09f59af3f0a64a710485daf7a46ae0 (patch) | |
| tree | 58f33d4d91bc5176552fa41018c3a27729443e67 | |
| parent | a7c8b1906d326143419760a6448fec7407530a73 (diff) | |
| download | ATCD-f208d4646a09f59af3f0a64a710485daf7a46ae0.tar.gz | |
Tue Dec 29 16:37:54 UTC 2009 Vladimir Zykov <vladimir.zykov@prismtech.com>
* orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp:
Fixed a small memory leak.
* tests/RTCORBA/Banded_Connections/run_test.pl:
Fixed a typo in IOR name.
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp | 8 | ||||
| -rwxr-xr-x | TAO/tests/RTCORBA/Banded_Connections/run_test.pl | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d5139678633..9da1956cea9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Dec 29 16:37:54 UTC 2009 Vladimir Zykov <vladimir.zykov@prismtech.com> + + * orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp: + Fixed a small memory leak. + + * tests/RTCORBA/Banded_Connections/run_test.pl: + Fixed a typo in IOR name. + Tue Dec 29 09:23:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h: diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp index a5e53e41f4c..7fbc7de4fe0 100644 --- a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp @@ -50,7 +50,7 @@ struct SupplierTask : ACE_Task_Base ACE_Time_Value event_delay (0, 1000 * delay_ms); ACE_OS::sleep (event_delay); } - this->orb_->destroy (); + this->orb_->shutdown (); return 0; } }; @@ -125,7 +125,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) servant.activate (); } - SupplierTask *pST = 0; + ACE_Auto_Ptr<SupplierTask> pST; if (supplier) { // The supplier will use its own ORB. @@ -155,7 +155,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) consumer->connect_push_supplier (CosEventComm::PushSupplier::_nil ()); - ACE_NEW_RETURN (pST, SupplierTask (consumer.in (), s_orb.in ()), -1); + SupplierTask *tmp = 0; + ACE_NEW_RETURN (tmp, SupplierTask (consumer.in (), s_orb.in ()), -1); + pST.reset (tmp); pST->activate (); } diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl index c9c19e6a6a7..5bf065a4b6c 100755 --- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl +++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl @@ -51,7 +51,7 @@ else { "-b bands.unix"; } -$SV = $server->CreateProcess ("server", $server_args . " -n $server_iorfile1 -o $server_iorfile1"), +$SV = $server->CreateProcess ("server", $server_args . " -n $server_iorfile1 -o $server_iorfile2"), $CL = $client->CreateProcess ("client", "-n file://$client_iorfile1 -o file://$client_iorfile2"); |