*** empty log message ***

5 files changed, 22 insertions, 2 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.h b/TAO/CIAO/DAnCE/ciao/Container_Base.h
index 2537189f21e..5277ef1e423 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.h
@@ -218,6 +218,10 @@ namespace CIAO
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+
     // Uninstall a servant for component or home.
     void uninstall (CORBA::Object_ptr objref,
                     Container::OA_Type t
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
index ac863b8d18a..7d5c9b00559 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
@@ -32,6 +32,15 @@ namespace CIAO
     return this->home_servant_poa_.in ();
   }
 
+  CORBA::Object_ptr
+  Swapping_Container::get_home_objref (PortableServer::Servant p
+                                       ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+  {
+    return this->the_home_servant_POA ()->servant_to_reference (p
+       ACE_ENV_ARG_PARAMETER);
+  }
+
   int
   Swapping_Container::init (const char *name,
                             const CORBA::PolicyList *more_policies
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.h b/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
index f6c79773ca3..83d3e5f47a7 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.h
@@ -59,6 +59,10 @@ namespace CIAO
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
     virtual void update_servant_map (PortableServer::ObjectId &oid,
                                      Dynamic_Component_Servant_Base* servant
                                      ACE_ENV_ARG_DECL);
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.inl b/TAO/CIAO/DAnCE/ciao/Swapping_Container.inl
index 9d6df55bb3f..b2c00a33346 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.inl
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.inl
@@ -5,6 +5,6 @@ CIAO::Swapping_Container::get_objref (PortableServer::Servant p
                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->the_home_servant_POA ()->servant_to_reference (p
+  return this->the_POA ()->servant_to_reference (p
                                                  ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
index 8a1882d05d9..a8605031fab 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -75,6 +75,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::RemoveFailure))
   {
+    ACE_DEBUG ((LM_DEBUG, "i am being called to remove the component\n"));
     COMP_VAR _ciao_comp = COMP::_narrow (comp
                                          ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
@@ -87,6 +88,8 @@ namespace CIAO
     _ciao_comp->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
+    ACE_DEBUG ((LM_DEBUG, "i am being called to passivate the components\n"));
+
     this->_ciao_passivate_component (_ciao_comp.in ()
                                      ACE_ENV_ARG_PARAMETER);
   }
@@ -188,7 +191,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::Object_var hobj =
-      this->container_->get_objref (this
+      this->container_->get_home_objref (this
                                     ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (COMP::_nil ());