*** empty log message ***

5 files changed, 17 insertions, 15 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
index db7d58ba2f7..2f4907fa8cc 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
@@ -23,7 +23,8 @@ namespace CIAO
       :Dynamic_Component_Servant_Base (c),
        executor_ (Components::EnterpriseComponent::_duplicate (ec)),
        home_servant_ (home_servant),
-       home_ (Components::CCMHome::_duplicate (home))
+       home_ (Components::CCMHome::_duplicate (home)),
+       component_removed_ (0)
   {
   }
 
@@ -52,7 +53,9 @@ namespace CIAO
     if (this->servant_map_.find (oid, servant) == 0)
       {
         servant->remove ();
+        component_removed_ = 1;
       }
+    ACE_DEBUG ((LM_DEBUG, "flag at remove is %d\n", component_removed_));
   }
 
   template <typename COMP_SVNT,
@@ -80,6 +83,15 @@ namespace CIAO
     COMP_SVNT *svt = new COMP_SVNT(ciao_comp.in (), this->home_.in (),
                                    this->home_servant_,
                                    this->container_);
+    ACE_DEBUG ((LM_DEBUG, "i am creating the servant\n"));
+    ACE_DEBUG ((LM_DEBUG, "flag is %d\n", component_removed_));
+    if (component_removed_ == 1)
+      {
+        svt->ciao_preactivate ();
+        svt->ciao_activate ();
+        svt->ciao_postactivate ();
+        component_removed_ = 0;
+      }
     PortableServer::ServantBase_var safe (svt);
     this->servant_map_.bind (oid, svt);
     return safe._retn ();
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
index dabca16470f..4fa5f246b70 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.h
@@ -59,6 +59,7 @@ namespace CIAO
                             ACE_Equal_To<PortableServer::ObjectId>,
                             ACE_SYNCH_MUTEX>
       servant_map_;
+    int component_removed_;
   };
 }
 
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 f27244f1a95..0422b0f7a06 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -95,7 +95,7 @@ namespace CIAO
     {
       servant->destroy (oid);
     }
-    this->container_->delete_servant_map (oid);
+    // this->container_->delete_servant_map (oid);
   }
 
   // Operations for keyless home interface.
@@ -244,12 +244,14 @@ namespace CIAO
                     COMP_SVNT>::update_component_map (
     PortableServer::ObjectId &oid)
   {
+    /*
     Dynamic_Component_Servant_Base *servant;
     if (dynamic_servant_map_.unbind (oid, servant) != 0)
       {
         ACE_DEBUG ((LM_DEBUG, "Invalid component object reference\n"));
         return;
       }
+    */
     return;
   }
 
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp
index 00938e190ac..4b934b6fad2 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp
@@ -99,7 +99,6 @@ Sender_Impl::Sender_exec_1_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                    Components::CCMException))
 {
   ACE_DEBUG ((LM_DEBUG, "Sender_Impl::Sender_exec_1_i::ccm_passivate\n"));
-  ACE_DEBUG ((LM_DEBUG, "1 being removed\n"));
   CORBA::Object_var comp_object =
     this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -111,17 +110,6 @@ Sender_Impl::Sender_exec_1_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     sender->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
-  ACE_DEBUG ((LM_DEBUG, "i am here\n"));
-
-  CORBA::ULong cons_len = cons_desc->length ();
-
-  ACE_DEBUG ((LM_DEBUG, "cons length is %d\n", cons_len));
-
-  for (CORBA::ULong i = 0; i < cons_len; ++i)
-    {
-      ACE_DEBUG ((LM_DEBUG, "consumer name is %s\n", cons_desc[i]->name ()));
-    }
-
   this->base_exec_->consumers (cons_desc._retn ());
 }
 
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp
index 2483b842922..d16f85ee742 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp
@@ -119,7 +119,6 @@ Sender_Impl::Sender_exec_2_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                    Components::CCMException))
 {
   ACE_DEBUG ((LM_DEBUG, "Sender_Impl::Sender_exec_2_i::ccm_passivate\n"));
-  ACE_DEBUG ((LM_DEBUG, "2 being removed\n"));
 }
 
 void