diff options
| author | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-02 13:10:14 +0000 |
|---|---|---|
| committer | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-02 13:10:14 +0000 |
| commit | bb447d843561d94f3615b22cc8bea61bd75ce954 (patch) | |
| tree | 906b10e40ff4e5454ff395820294e959bcb7599a | |
| parent | cff1c67f677f10329e92728a073ae56b0d74d3a7 (diff) | |
| download | ATCD-bb447d843561d94f3615b22cc8bea61bd75ce954.tar.gz | |
Wed Nov 02 12:09:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* tests/Collocation/Receiver/Receiver_exec.cpp:
Cancel timer and delete generators
| -rw-r--r-- | CIAO/ChangeLog | 4 | ||||
| -rw-r--r-- | CIAO/tests/Collocation/Receiver/Receiver_exec.cpp | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 9df2344c300..03fd3ba05ae 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,7 @@ +Wed Nov 02 12:09:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + * tests/Collocation/Receiver/Receiver_exec.cpp: + Cancel timer and delete generators + Wed Nov 02 08:04:13 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> * tests/Collocation/Receiver/Receiver_exec.cpp: * tests/Collocation/Sender/Sender_exec.cpp: diff --git a/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp b/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp index 1ed008fcd2d..271e921535b 100644 --- a/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp +++ b/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp @@ -58,7 +58,10 @@ namespace CIAO_Receiver_Impl strategy_("thru_poa") { ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::Receiver_exec_i \n ")); - this->hello_generator_ = new HelloGenerator (*this); + ACE_NEW_THROW_EX (this->hello_generator_, + HelloGenerator (*this), + ::CORBA::NO_MEMORY ()); + } Receiver_exec_i::~Receiver_exec_i (void) @@ -114,7 +117,7 @@ namespace CIAO_Receiver_Impl } catch (const CORBA::INTERNAL& /*ex*/) { - if (ACE_OS::strcmp ("no_thru_poa", this->strategy_.in())== 0) + if (ACE_OS::strcmp ("no_thru_poa", this->strategy_)== 0) { ACE_DEBUG ((LM_DEBUG, "OK: Receiver received expected exception\n")); } @@ -201,6 +204,7 @@ namespace CIAO_Receiver_Impl { /// No need to implement anything ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_passivate \n ")); + this->reactor ()->cancel_timer (this->hello_generator_); } void @@ -208,6 +212,7 @@ namespace CIAO_Receiver_Impl { /// No need to implement anything ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove \n ")); + delete this->hello_generator_; } extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr |