*** empty log message ***

3 files changed, 32 insertions, 20 deletions

diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h
index 487b0532e3a..7ee60e9b87c 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h
@@ -36,16 +36,28 @@ namespace Sender_Impl
 
     ~SenderSwap_exec_i ();
 
-    virtual ::Components::EnterpriseComponent_ptr 
+    virtual ::Components::EnterpriseComponent_ptr
     incarnate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual ::Components::EnterpriseComponent_ptr 
+    virtual ::Components::EnterpriseComponent_ptr
     etherealize (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+    void  consumers (::Components::ConsumerDescriptions_ptr p)
+    {
+      this->consumers_ = p;
+    }
+
+    ::Components::ConsumerDescriptions_ptr consumers (void)
+    {
+      return this->consumers_._retn ();
+    }
+
   protected:
     int count_;
+
+    ::Components::ConsumerDescriptions_var consumers_;
   };
 
   class SENDER_EXEC_Export SenderHome_exec_i :
@@ -65,6 +77,8 @@ namespace Sender_Impl
     create (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::CCMException));
+
+
   };
 
 }
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 9342f4a0c73..c82cafdf8fb 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp
@@ -33,7 +33,7 @@ Hello::CCM_ReadMessage_ptr
 Sender_Impl::Sender_exec_1_i::get_push_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Sender_Impl::Sender_exec.i::get_push_message called\n "));
   return ( new Message_Impl_1 (*this) );
 }
@@ -48,7 +48,7 @@ Sender_Impl::Sender_exec_1_i::start (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Sender_Impl::Sender_exec_1_i::set_session_context 
+Sender_Impl::Sender_exec_1_i::set_session_context
    (Components::SessionContext_ptr ctx
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -110,24 +110,18 @@ 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);
 
-  ::Components::FacetDescriptions_var facet_desc =
-    sender->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 ()));
     }
-  for (CORBA::ULong i = 0; i < facet_len; ++i)
-    {
-      ACE_DEBUG ((LM_DEBUG, "facet name is %s\n", facet_desc[i]->name ()));
-    }
+
+  this->base_exec_->consumers (cons_desc._retn ());
 }
 
 void
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.h b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.h
index 4e5e04b85a4..d5cfd66613d 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.h
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.h
@@ -23,15 +23,13 @@ namespace Sender_Impl
   {
 
   public:
-    /// Default constructor.
-    Sender_exec_1_i ()
-        : message_(CORBA::string_dup ("Default Message"))
-    {
-    }
+
 
     /// Secondary construction.
-    Sender_exec_1_i (const char* local_message)
+    Sender_exec_1_i (const char* local_message
+                     SenderSwap_exec_i *e)
       : message_ (CORBA::string_dup (local_message))
+      , base_exec_ (e)
     {
     }
 
@@ -95,6 +93,12 @@ namespace Sender_Impl
   private:
     CORBA::String_var message_;
 
+    // my incarnator
+    SenderSwap_exec_i *base_exec_;
+
+    /// Default constructor.
+    Sender_exec_1_i () {};
+
     friend class Message_Impl_1;
   };