*** empty log message ***

7 files changed, 24 insertions, 9 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
index 57aab75fad3..818a8d3922d 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
@@ -14,6 +14,12 @@ namespace CIAO
 {
 
 ////////////////////////////////////////////////////////////////
+
+  Container::Container (void)
+  {
+    ACE_ASSERT (0);
+  }
+
   Container::Container (CORBA::ORB_ptr o)
     : orb_ (CORBA::ORB::_duplicate (o))
   {
@@ -40,6 +46,11 @@ namespace CIAO
   ACE_Atomic_Op <ACE_SYNCH_MUTEX, long>
   Session_Container::serial_number_ (0);
 
+  Session_Container::Session_Container (void)
+  {
+    ACE_ASSERT (0);
+  }
+
   Session_Container::Session_Container (CORBA::ORB_ptr o,
                                         bool static_config_flag,
                                         const Static_Config_EntryPoints_Maps* maps)
@@ -244,8 +255,6 @@ namespace CIAO
                      Deployment::ImplEntryPointNotFound,
                      Deployment::InstallationFailure))
   {
-
-    ACE_DEBUG ((LM_DEBUG, "I am here to install the home\n"));
     HomeFactory hcreator = 0;
     ServantFactory screator = 0;
 
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.h b/TAO/CIAO/DAnCE/ciao/Container_Base.h
index 4eb1aecf350..18bbdc997e6 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.h
@@ -49,6 +49,8 @@ namespace CIAO
         Facet_Consumer
       };
 
+    explicit Container (void);
+
     Container (CORBA::ORB_ptr o);
 
     virtual ~Container (void) = 0;
@@ -148,6 +150,8 @@ namespace CIAO
   {
   public:
 
+    explicit Session_Container (void);
+
     // @@ (OO) Does the static_config_flag really need to be an int?
     //         It appears to be a boolean value.  Please use bool
     //         instead.
@@ -203,14 +207,12 @@ namespace CIAO
                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-/*
     virtual void add_servant_map (PortableServer::ObjectId &oid,
                                   Dynamic_Component_Servant_Base* servant
                                   ACE_ENV_ARG_DECL) = 0;
 
     virtual void delete_servant_map (PortableServer::ObjectId &oid
                                      ACE_ENV_ARG_DECL) = 0;
-*/
     // Install a component servant.
     CORBA::Object_ptr install_component (PortableServer::Servant p,
                                          PortableServer::ObjectId_out oid
@@ -222,11 +224,9 @@ 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,
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
index 2302799beda..0894ffeb84a 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
@@ -67,7 +67,6 @@ namespace CIAO
         servant->remove ();
         component_removed_ = 1;
       }
-    ACE_DEBUG ((LM_DEBUG, "flag at remove is %d\n", component_removed_));
   }
 
   template <typename COMP_SVNT,
diff --git a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
index b490bac1217..d10336225bd 100644
--- a/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Home_Servant_Impl_T.cpp
@@ -163,7 +163,6 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CreateFailure))
   {
-    ACE_DEBUG ((LM_DEBUG, "creating the component\n"));
     return this->create (ACE_ENV_SINGLE_ARG_PARAMETER);
   }
 
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
index ae3ae6993af..e93a3315c14 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.cpp
@@ -391,7 +391,7 @@ CIAO::NodeApplication_Impl::init (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (this->container_,
-                    CIAO::Session_Container (this->orb_.in (), 0, 0),
+                    CIAO::Swapping_Container (this->orb_.in ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (-1);
 
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
index 087e269815b..20cca306df0 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
@@ -37,6 +37,7 @@ namespace CIAO
                                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    ACE_DEBUG ((LM_DEBUG, "i am inside get home objref \n"));
     return this->the_home_servant_POA ()->servant_to_reference (p
        ACE_ENV_ARG_PARAMETER);
   }
@@ -107,6 +108,7 @@ namespace CIAO
      Dynamic_Component_Servant_Base* servant
      ACE_ENV_ARG_DECL)
   {
+    ACE_DEBUG ((LM_DEBUG, "i am in add servant map\n"));
     this->dsa_->add_servant_map (oid, servant);
   }
 
@@ -115,6 +117,7 @@ namespace CIAO
     (PortableServer::ObjectId &oid
      ACE_ENV_ARG_DECL)
   {
+    ACE_DEBUG ((LM_DEBUG, "i am in delete servant map\n"));
     this->dsa_->delete_servant_map (oid);
   }
 
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 b9a8c9f2427..6a667ba68e2 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -189,6 +189,7 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    ACE_DEBUG ((LM_DEBUG, "got home obj ref\n"));
     CORBA::Object_var hobj =
       this->container_->get_home_objref (this
                                     ACE_ENV_ARG_PARAMETER);
@@ -215,6 +216,8 @@ namespace CIAO
        <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, EXEC, EXEC_VAR, COMP>
           (ec, home, this, this->container_);
 
+    ACE_DEBUG ((LM_DEBUG, "adding to servant map\n"));
+
     this->container_->add_servant_map (oid, svt);
 
     this->dynamic_servant_map_.bind (oid, svt);
@@ -223,6 +226,8 @@ namespace CIAO
                                  ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (COMP::_nil ());
 
+    ACE_DEBUG ((LM_DEBUG, "returning the reference\n"));
+
     return ho._retn ();
   }