diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-24 12:20:42 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-10-24 12:20:42 +0000 |
| commit | e9839f012f2443ba8f855570d8d3a0bdd807df1a (patch) | |
| tree | 7c612be2506317e74d14560327e13fe1ee9f7aac | |
| parent | 6b10c1110f09d1b982d5ea69b3cda736ff3d7129 (diff) | |
| download | ATCD-e9839f012f2443ba8f855570d8d3a0bdd807df1a.tar.gz | |
2 files changed, 5 insertions, 5 deletions
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp index 4b367c3e19f..91093f8d73e 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp @@ -53,6 +53,7 @@ namespace CIAO_Shapes_Control_comp_Impl Control_comp_exec_i::~Control_comp_exec_i (void) { + delete this->ticker_; } // Supported operations and attributes. @@ -60,9 +61,9 @@ namespace CIAO_Shapes_Control_comp_Impl Control_comp_exec_i::reactor (void) { ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = + ::CORBA::Object_var ccm_object = this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) + if (! ::CORBA::is_nil (ccm_object.in ())) { ::CORBA::ORB_var orb = ccm_object->_get_orb (); if (! ::CORBA::is_nil (orb.in ())) @@ -175,7 +176,6 @@ namespace CIAO_Shapes_Control_comp_Impl Control_comp_exec_i::stop (void) { this->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; } // Component attributes and port operations. diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp index 6fe4d21cded..37e504c15c3 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Control_comp/Shapes_Control_comp_exec.cpp @@ -53,9 +53,9 @@ namespace CIAO_Shapes_Control_comp_Impl Control_comp_exec_i::reactor (void) { ACE_Reactor* reactor = 0; - ::CORBA::Object_var ccm_object = + ::CORBA::Object_var ccm_object = this->ciao_context_->get_CCM_object(); - if (! ::CORBA::is_nil (ccm_object.in ())) + if (! ::CORBA::is_nil (ccm_object.in ())) { ::CORBA::ORB_var orb = ccm_object->_get_orb (); if (! ::CORBA::is_nil (orb.in ())) |