summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-05-25 16:15:06 +0000
committerjai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-05-25 16:15:06 +0000
commit7147611b6dbe53b8250ad03397380fd785cea3f5 (patch)
tree57465f6b7b919de18d790e6ed54d965a59eb093c
parent08724ced01b10af84fa1e1aa9b301c7e26dee6b5 (diff)
downloadATCD-7147611b6dbe53b8250ad03397380fd785cea3f5.tar.gz
Wed May 25 11:13:19 2005 Jaiganesh B <jai@dre.vanderbilt.edu>
-rw-r--r--TAO/CIAO/ChangeLog10
-rw-r--r--TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp4
2 files changed, 14 insertions, 0 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 14636af9246..252edbe51a3 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Wed May 25 11:13:19 2005 Jaiganesh B <jai@dre.vanderbilt.edu>
+
+ * DAnCE/ciao/Servant_Impl_Base.cpp:
+
+ Added code to call ccm_remove () on the executor
+ before removing the component.
+
+ Thanks to Steven Baker <Steven_D_Baker@raytheon.com> for
+ identifying the problem.
+
Wed May 25 10:52:39 2005 Cassia Tatibana <cassia@lindy.dre.vanderbilt.edu>
* DAnCE/examples/Display/HUDisplay.idl:
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
index e7a2772ce22..17045ff8dad 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
@@ -90,6 +90,10 @@ namespace CIAO
Components::SessionComponent_var temp = this->get_executor ();
temp->ccm_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
*/
+
+ Components::SessionComponent_var temp = this->get_executor ();
+ temp->ccm_remove (ACE_ENV_SINGLE_ARG_PARAMETER);
+
CORBA::Object_var objref =
this->container_->get_objref (this);