*** empty log message ***

9 files changed, 20 insertions, 28 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
index 28b212d02d4..b64f9c7b9dc 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
@@ -65,7 +65,6 @@ namespace CIAO
     if (this->servant_map_.find (oid, servant) == 0)
       {
         servant->remove ();
-        ACE_DEBUG ((LM_DEBUG, "called the remove on the servant\n"));
         component_removed_ = 1;
       }
   }
@@ -80,6 +79,8 @@ namespace CIAO
     <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, 
      EXEC, EXEC_VAR, COMP>::create (PortableServer::ObjectId &oid)
   {
+    ACE_DEBUG ((LM_DEBUG, 
+                "i am being asked to create a new servant here\n\n"));
     CIAO::Swap_Exec_var swap_exec = CIAO::Swap_Exec::_narrow
        (this->executor_.in ()
         ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
index 6467ae48a9a..31755a74db2 100644
--- a/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Servant_Impl_Base.cpp
@@ -68,8 +68,6 @@ namespace CIAO
     Components::SessionComponent_var temp = this->get_executor ();
     temp->ccm_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-    ACE_DEBUG ((LM_DEBUG, "i called the remove from the servant base \n"));
-
     CORBA::Object_var objref =
       this->container_->get_objref (this);
 
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
index 85d067f2388..087e269815b 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
@@ -250,19 +250,14 @@ namespace CIAO
                                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
-    ACE_DEBUG ((LM_DEBUG , " i am being called to uninstall\n"));
-    ACE_DEBUG ((LM_DEBUG , " i am being called to uninstall\n"));
     PortableServer::POA_ptr tmp = this->home_servant_poa_.in ();
-    ACE_DEBUG ((LM_DEBUG , " i am being called to uninstall\n"));
     PortableServer::ObjectId_var oid =
       tmp->reference_to_id (homeref
                             ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    ACE_DEBUG ((LM_DEBUG , " i am being called to uninstall\n"));
 
     tmp->deactivate_object (oid.in ()
                             ACE_ENV_ARG_PARAMETER);
-    ACE_DEBUG ((LM_DEBUG , " i am being called to uninstall\n"));
   }
 
   CORBA::Object_ptr
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 abfeeea390a..201cc92b2f3 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -89,7 +89,6 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::RemoveFailure))
   {
-    ACE_DEBUG ((LM_DEBUG, "i am being called to remove the component\n"));
     PortableServer::ObjectId_var oid =
       PortableServer::string_to_ObjectId (this->obj_id_);
 
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp b/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp
index 3e9939a135d..94ab1dd2c47 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_exec.cpp
@@ -132,19 +132,15 @@ Receiver_Impl::Receiver_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     receiver->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
-  ACE_DEBUG ((LM_DEBUG, "i am here\n"));
-
   CORBA::ULong cons_len = cons_desc->length ();
   CORBA::ULong facet_len = facet_desc->length ();
-  ACE_DEBUG ((LM_DEBUG, "cons length is %d\n", cons_len));
-  ACE_DEBUG ((LM_DEBUG, "facet length is %d\n", facet_len));
   for (CORBA::ULong i = 0; i < cons_len; ++i)
     {
-      ACE_DEBUG ((LM_DEBUG, "consumer name is %s\n", cons_desc[i]->name ()));
+      // ACE_DEBUG ((LM_DEBUG, "consumer name is %s\n", cons_desc[i]->name ()));
     }
   for (CORBA::ULong i = 0; i < facet_len; ++i)
     {
-      ACE_DEBUG ((LM_DEBUG, "facet name is %s\n", facet_desc[i]->name ()));
+      // ACE_DEBUG ((LM_DEBUG, "facet name is %s\n", facet_desc[i]->name ()));
     }
 }
 
@@ -171,16 +167,16 @@ Receiver_Impl::ReceiverHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL)
                    Components::CCMException))
 {
   Components::EnterpriseComponent_ptr tmp;
-  /*
+  
   ACE_NEW_THROW_EX (tmp,
                     Receiver_Impl::ReceiverSwap_exec_i,
                     CORBA::NO_MEMORY ());
-  */
-  
+  /*  
   ACE_NEW_THROW_EX (tmp,
                     Receiver_Impl::Receiver_exec_i,
                     CORBA::NO_MEMORY ());
-  
+  */
+ 
   return tmp;
 }
 
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp
index 91d2e05fc86..1acce82d312 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp
@@ -196,8 +196,8 @@ Sender_Impl::SenderHome_exec_i::create (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                    Components::CCMException))
 {
   ACE_DEBUG ((LM_DEBUG, "%P|%t) creating SenderHome \n"));
-  //return new Sender_Impl::SenderSwap_exec_i;
-   return new Sender_Impl::Sender_exec_i;
+  return new Sender_Impl::SenderSwap_exec_i;
+  //return new Sender_Impl::Sender_exec_i;
 }
 
 extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
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 2293e563cfb..e198948e955 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp
@@ -102,16 +102,12 @@ Sender_Impl::Sender_exec_1_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   CORBA::Object_var comp_object =
     this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
   Hello::Sender_var sender = Hello::Sender::_narrow (comp_object.in ()
                                                     ACE_ENV_ARG_PARAMETER);
-
   ::Components::ConsumerDescriptions_var cons_desc =
     sender->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-
-  ACE_DEBUG ((LM_DEBUG, "length of consumers is %d\n", cons_desc->length ()));
-
+  // ACE_DEBUG ((LM_DEBUG, "length of consumers is %d\n", cons_desc->length ()));
   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 b25030cb877..41ce1aa6e2e 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp
@@ -90,6 +90,11 @@ Sender_Impl::Sender_exec_2_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   ACE_DEBUG ((LM_DEBUG, "length of consumers is %d\n", c->length ()));
 
+  if (CORBA::is_nil (this->context_.in ()))
+       ACE_THROW (CORBA::INTERNAL ());
+  ACE_CHECK;
+  ACE_DEBUG ((LM_DEBUG, "obtained the context\n"));
+
   CORBA::Object_var o =
     this->context_->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER);
 
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/starter.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/starter.cpp
index ae2745fde48..3fe54c93bdd 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/starter.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/starter.cpp
@@ -88,8 +88,10 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
       sender->remove ();
 
-      //sender->start (ACE_ENV_SINGLE_ARG_PARAMETER);
-      //ACE_TRY_CHECK;
+      ACE_DEBUG ((LM_DEBUG, "creating one more servant here\n"));
+      sender->start (ACE_ENV_SINGLE_ARG_PARAMETER);
+      sender->remove ();
+      ACE_TRY_CHECK;
 
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;