*** empty log message ***

6 files changed, 23 insertions, 4 deletions

diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp
index cbb9932d089..cb2ddf30b41 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Activator.cpp
@@ -25,6 +25,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest))
   {
+    ACE_DEBUG ((LM_DEBUG, "i am here to incarnate\n"));
     Dynamic_Component_Servant_Base* servant = 0;
 
     if (this->servant_map_.find (oid, servant) == 0)
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h
index 80b0d4c491b..562c91909f1 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_Base.h
@@ -32,7 +32,7 @@ namespace CIAO
   public:
     explicit Dynamic_Component_Servant_Base (void);
 
-    Dynamic_Component_Servant_Base (Session_Container *c);
+    Dynamic_Component_Servant_Base (Swapping_Container *c);
 
     virtual ~Dynamic_Component_Servant_Base (void);
 
diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
index 2e7f5c92fc1..3347e1448d4 100644
--- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp
@@ -30,6 +30,17 @@ namespace CIAO
             typename EXEC,
             typename EXEC_VAR,
             typename COMP>
+  Dynamic_Component_Servant<COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR,
+    EXEC, EXEC_VAR, COMP>::~Dynamic_Component_Servant (void)
+  {
+  } 
+
+  template <typename COMP_SVNT,
+            typename COMP_EXEC,
+            typename COMP_EXEC_VAR,
+            typename EXEC,
+            typename EXEC_VAR,
+            typename COMP>
   PortableServer::Servant Dynamic_Component_Servant
     <COMP_SVNT, COMP_EXEC, COMP_EXEC_VAR, 
      EXEC, EXEC_VAR, COMP>::create (void)
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
index 2d122d5be82..a4190be2a37 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Container.cpp
@@ -32,6 +32,8 @@ namespace CIAO
                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+
+    ACE_DEBUG ((LM_DEBUG, "swap container init \n"));
     char buffer[MAXPATHLEN];
 
     if (name == 0)
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 cb41bb07998..329a180ed6e 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -25,9 +25,9 @@ namespace CIAO
                     COMP_EXEC_VAR,
                     COMP_SVNT>::Swapping_Servant_Home_Impl (
       EXEC * exe,
-      Swapping_Container * c)
+      Swapping_Container * c, const char* obj_id, const char* repo_id)
     : Swapping_Servant_Home_Impl_Base (c),
-      executor_ (EXEC::_duplicate (exe))
+      executor_ (EXEC::_duplicate (exe)), obj_id_ (obj_id), repo_id_ (repo_id)
   {
   }
 
@@ -142,6 +142,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::CreateFailure))
   {
+    ACE_DEBUG ((LM_DEBUG, "i am creating the home here inside create ()\n"));
     if (this->executor_.in () == 0)
     {
       ACE_THROW_RETURN (CORBA::INTERNAL (),
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
index 2ef798e6ca7..656fb41a0bc 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
@@ -54,7 +54,8 @@ namespace CIAO
   {
   public:
     Swapping_Servant_Home_Impl (EXEC * exe,
-                       Swapping_Container * c);
+                       Swapping_Container * c,
+                       const char* obj_id, const char* repo_id);
 
     virtual ~Swapping_Servant_Home_Impl (void);
 
@@ -102,6 +103,9 @@ namespace CIAO
                             ACE_Equal_To<PortableServer::ObjectId>,
                             ACE_SYNCH_MUTEX>
       component_map_;
+
+    const char* obj_id_;
+    const char* repo_id_;
   };
 }