Tue Nov 30 09:55:39 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl>

        * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp:
        * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl:
        * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h:
        * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h:
        * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl:
        * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl:
        Implementation test.

8 files changed, 112 insertions, 80 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d4e890d0604..60b8a285034 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Tue Nov 30 09:55:39 UTC 2010  Marijke Hengstmengel <mhengstmengel@remedy.nl>
+
+        * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl:
+        * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h:
+        * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h:
+        * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl:
+        * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl:
+        Implementation test.
+
 Tue Nov 30 12:50:54 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc:
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl
index 8cc6f518bc8..15289b5e816 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.idl
@@ -17,9 +17,17 @@
 
 module CCM_DDS
 {
-  module Duplex_Typed <typename T, sequence<T> TSeq, typename Y, sequence <Y> YSeq> {
+  module Duplex_Typed <typename T, sequence<T> TSeq, typename Y,  sequence <Y> YSeq> {
     alias Typed <T, TSeq> T_Typed;
     alias Typed <Y, YSeq> Y_Typed;
+
+	//new
+	typedef T_Typed::DataReader DataReader_t;
+    typedef T_Typed::DataWriter DataWriter_t;
+    typedef Y_Typed::DataReader DataReader_y;
+    typedef Y_Typed::DataWriter DataWriter_y;
+  // end new
+
     local interface Foo {
       void op ();
     };
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl
index 4024f45f720..21bd9bc8bc6 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.idl
@@ -14,8 +14,8 @@ module MultipleTemp
 {
   component Receiver
   {
-    port MultipleTempConnector::DDS_Listen info_one_out;
-    port MultipleTempConnector::DDS_Listen info_two_out;
+	  port MultipleTempConnector::T_Typed::DDS_Listen info_one_out;
+	  port MultipleTempConnector::Y_Typed::DDS_Listen info_two_out;
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
index 317b3d78a70..1d0a67584f2 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
@@ -83,20 +83,23 @@ namespace CIAO_MultipleTemp_Receiver_Impl
 
   void
   ListenTwo_Listener_exec_i::on_one_data (
-                                  const TestTopicTwo & an_instance,
+//                                  const TestTopicTwo & an_instance,
+                                  const TestTopicOne & an_instance,
                                   const ::CCM_DDS::ReadInfo & info)
     {
       ACE_DEBUG ((LM_DEBUG, "ListenTwo_Listener_exec_i::on_one_data: "
                               "key <%C> - iteration <%d>\n",
-                              an_instance.keyTwo.in (),
-                              an_instance.y));
+                        //      an_instance.keyTwo.in (),
+							  an_instance.keyOne.in (),
+                              an_instance.x));
       if (!info.instance_handle.isValid)
         {
           ACE_ERROR ((LM_ERROR, "ERROR: ListenTwo_Listener_exec_i::on_one_data: "
                               "instance handle seems to be invalid "
                               "key <%C> - iteration <%d>\n",
-                              an_instance.keyTwo.in (),
-                              an_instance.y));
+                              an_instance.keyOne.in (),
+  			         //        an_instance.keyTwo.in (),
+                              an_instance.x));
         }
       if (info.source_timestamp.sec == 0 &&
           info.source_timestamp.nanosec == 0)
@@ -104,15 +107,17 @@ namespace CIAO_MultipleTemp_Receiver_Impl
           ACE_ERROR ((LM_ERROR, "ERROR: ListenTwo_Listener_exec_i::on_one_data: "
                               "source timestamp seems to be invalid (nil) "
                               "key <%C> - iteration <%d>\n",
-                              an_instance.keyTwo.in (),
-                              an_instance.y));
+                  //            an_instance.keyTwo.in (),
+	                           an_instance.keyOne.in (),
+                               an_instance.x));
         }
     ++received_two;
   }
 
   void
   ListenTwo_Listener_exec_i::on_many_data (
-                                  const TestTopicTwoSeq & ,
+//                                  const TestTopicTwoSeq & ,
+                                  const TestTopicOneSeq & ,
                                   const ::CCM_DDS::ReadInfoSeq & )
   {
   }
@@ -127,55 +132,54 @@ namespace CIAO_MultipleTemp_Receiver_Impl
   Receiver_exec_i::~Receiver_exec_i (void)
   {
   }
-
-  // Port operations.
+   // Port operations.
   ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_out_one_status (void)
+  Receiver_exec_i::get_info_one_out_status (void)
   {
     return ::CCM_DDS::CCM_PortStatusListener::_nil ();
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
-   Receiver_exec_i::get_info_out_two_status (void)
+   Receiver_exec_i::get_info_two_out_status (void)
    {
      return ::CCM_DDS::CCM_PortStatusListener::_nil ();
    }
 
-  ::MultipleTemp::MultipleTempConnector::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_one_data_listener (void)
+  ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_ptr
+  Receiver_exec_i::get_info_one_out_data_listener (void)
   {
     if ( ::CORBA::is_nil (this->ciao_info_out_one_data_listener_.in ()))
        {
-         info_out_one_data_listener_exec_i *tmp = 0;
+         ListenOne_Listener_exec_i *tmp = 0;
          ACE_NEW_RETURN (
            tmp,
-           info_out_one_data_listener_exec_i (
+           ListenOne_Listener_exec_i (
              this->ciao_context_.in ()),
-             :::MultipleTemp::MultipleTempConnector::CCM_Listener::_nil ());
+			 ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener::_nil ());
            this->ciao_info_out_one_data_listener_ = tmp;
        }
 
      return
-         ::MultipleTemp::MultipleTempConnector::CCM_Listener::_duplicate (
+         ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener::_duplicate (
          this->ciao_info_out_one_data_listener_.in ());
    }
 
-  ::MultipleTemp::MultipleTempConnector::CCM_Listener_ptr
-   Receiver_exec_i::get_info_out_two_data_listener (void)
+  ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_ptr
+   Receiver_exec_i::get_info_two_out_data_listener (void)
    {
     if ( ::CORBA::is_nil (this->ciao_info_out_two_data_listener_.in ()))
         {
-          info_out_two_data_listener_exec_i *tmp = 0;
+          ListenTwo_Listener_exec_i *tmp = 0;
           ACE_NEW_RETURN (
             tmp,
-            info_out_two_data_listener_exec_i (
+            ListenTwo_Listener_exec_i (
               this->ciao_context_.in ()),
-              :::MultipleTemp::MultipleTempConnector::CCM_Listener::_nil ());
+              ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener::_nil ());
             this->ciao_info_out_two_data_listener_ = tmp;
         }
 
       return
-          ::MultipleTemp::MultipleTempConnector::CCM_Listener::_duplicate (
+          ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener::_duplicate (
           this->ciao_info_out_two_data_listener_.in ());
    }
 
@@ -186,7 +190,7 @@ namespace CIAO_MultipleTemp_Receiver_Impl
   {
     this->ciao_context_ =
       ::MultipleTemp::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
+    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
       {
         throw ::CORBA::INTERNAL ();
       }
@@ -201,11 +205,11 @@ namespace CIAO_MultipleTemp_Receiver_Impl
   Receiver_exec_i::ccm_activate (void)
   {
     ::CCM_DDS::DataListenerControl_var dlc_one =
-        this->context_->get_connection_info_out_one_data_control ();
-    ::CCM_DDS::DataListenerControl_var dlc_one =
-        this->context_->get_connection_info_out_two_data_control ();
-    dlc_one->mode (::CCM_DDS::ONE_BY_ONE);
-    dlc_one->mode (::CCM_DDS::ONE_BY_ONE);
+        this->ciao_context_->get_connection_info_one_out_data_control ();
+    ::CCM_DDS::DataListenerControl_var dlc_two =
+        this->ciao_context_->get_connection_info_two_out_data_control ();
+
+	dlc_two->mode (::CCM_DDS::ONE_BY_ONE);
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h
index 03c69c2af74..f828e478ca9 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.h
@@ -23,12 +23,12 @@ namespace CIAO_MultipleTemp_Receiver_Impl
   // ListenOneByOneTest_Listener_exec_i one
   //============================================================
   class RECEIVER_EXEC_Export ListenOne_Listener_exec_i
-    : public virtual ::MultipleTemp::MultipleTempConnector::CCM_Listener,
+	  : public virtual ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener,
       public virtual ::CORBA::LocalObject
   {
   public:
     ListenOne_Listener_exec_i (
-        :::MultipleTemp::CCM_Receiver_Context_ptr ctx);
+        ::MultipleTemp::CCM_Receiver_Context_ptr ctx);
 
     virtual ~ListenOne_Listener_exec_i (void);
 
@@ -47,7 +47,7 @@ namespace CIAO_MultipleTemp_Receiver_Impl
   // ListenOneByOneTest_Listener_exec_i two
   //============================================================
   class RECEIVER_EXEC_Export ListenTwo_Listener_exec_i
-    : public virtual ::MultipleTemp::MultipleTempConnector::CCM_Listener,
+	  : public virtual ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener,
       public virtual ::CORBA::LocalObject
   {
   public:
@@ -58,11 +58,13 @@ namespace CIAO_MultipleTemp_Receiver_Impl
 
     virtual void
     on_one_data (
-      const TestTopicTwo& an_instance,
+//      const TestTopicTwo& an_instance,
+      const TestTopicOne& an_instance,
       const ::CCM_DDS::ReadInfo & info);
     virtual void
       on_many_data (
-        const TestTopicTwoSeq & an_instance,
+ //       const TestTopicTwoSeq & an_instance,
+        const TestTopicOneSeq & an_instance,
         const ::CCM_DDS::ReadInfoSeq & info);
   private:
     ::MultipleTemp::CCM_Receiver_Context_var ciao_context_;
@@ -79,16 +81,16 @@ namespace CIAO_MultipleTemp_Receiver_Impl
     virtual ~Receiver_exec_i (void);
 
     // Port operations.
-    virtual ::MultipleTemp::MultipleTempConnector::CCM_Listener_ptr
-    get_info_out_one_data_listener (void);
-    virtual ::MultipleTemp::MultipleTempConnector::CCM_Listener_ptr
-    get_info_out_two_data_listener (void);
-
+	virtual ::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_ptr
+    get_info_one_out_data_listener (void);
+	virtual ::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_ptr
+    get_info_two_out_data_listener (void);
 
+ 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_one_status (void);
+    get_info_one_out_status (void);
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_two_status (void);
+    get_info_two_out_status (void);
 
     // Operations from Components::SessionComponent.
     virtual void
@@ -103,8 +105,8 @@ namespace CIAO_MultipleTemp_Receiver_Impl
 
   private:
     ::MultipleTemp::CCM_Receiver_Context_var ciao_context_;
-    ::MultipleTemp::MultipleTempConnector::CCM_Listener_var ciao_info_out_one_data_listener_;
-    ::MultipleTemp::MultipleTempConnector::CCM_Listener_var ciao_info_out_two_data_listener_;
+	::MultipleTemp::MultipleTempConnector::T_Typed::CCM_Listener_var ciao_info_out_one_data_listener_;
+	::MultipleTemp::MultipleTempConnector::Y_Typed::CCM_Listener_var ciao_info_out_two_data_listener_;
    };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl
index 98b1c4bb17f..9a43c0c3631 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.idl
@@ -16,8 +16,8 @@ module MultipleTemp
 {
   component Sender
   {
-     port MultipleTempConnector::DDS_Update test_topic_one_update;
-     port MultipleTempConnector::DDS_Update test_topic_two_update;
+	  port MultipleTempConnector::T_Typed::DDS_Update test_topic_one_update;
+	  port MultipleTempConnector::Y_Typed::DDS_Update test_topic_two_update;
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
index af18f579d1d..c6b6bc15a8d 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.cpp
@@ -62,11 +62,12 @@ namespace CIAO_MultipleTemp_Sender_Impl
   }
   // Supported operations and attributes.
   CORBA::Boolean
-  Sender_exec_i::create_one()
+  Sender_exec_i::create_one_topic()
   {
     CORBA::Boolean result = true;
     TestTopicOne i = this->topic_one_seq_one_[0];
-    TestTopicTwo u = this->topic_two_seq_one_[0];
+ //   TestTopicTwo u = this->topic_two_seq_one_[0];
+	TestTopicOne u = this->topic_one_seq_one_[1];
     try
     {
       if ( ::CORBA::is_nil (this->updater_one_) ||
@@ -79,18 +80,18 @@ namespace CIAO_MultipleTemp_Sender_Impl
         {
           this->updater_one_->create_one(i);
           this->updater_two_->create_one(u);
-
+ 
            ACE_DEBUG ((LM_DEBUG,
                        ACE_TEXT ("MultipleTemp: create_one with instance keys")
                        ACE_TEXT ("<%C> and <%C>\n"),
-                       i.keyOne.in(), u.keyTwo.in()));
+                       i.keyOne.in(), u.keyOne.in()));
         }
     }
     catch(const CCM_DDS::AlreadyCreated &)
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: AlreadyCreated ")
                             ACE_TEXT ("with test updater create_one <%C>.\n"),
-                            i.keyOne.in(), u.keyTwo.in()));
+                            i.keyOne.in(), u.keyOne.in()));
       result= false;
     }
     catch (const CCM_DDS::InternalError& )
@@ -103,27 +104,30 @@ namespace CIAO_MultipleTemp_Sender_Impl
 
 
   CORBA::Boolean
-  Sender_exec_i::update_one()
+  Sender_exec_i::update_one_topic()
   {
     //update already created instance with handle nil
     CORBA::Boolean result = true;
     TestTopicOne i = this->topic_one_seq_one_[0];
-    TestTopicOne u = this->topic_two_seq_one_[0];
+//   TestTopicTwo u = this->topic_two_seq_one_[0];
+    TestTopicOne u = this->topic_one_seq_one_[1];
+
     try
     {
       this->updater_one_->update_one(i, DDS::HANDLE_NIL);
-      this->updater_two_->update_two(u, DDS::HANDLE_NIL);
+      this->updater_two_->update_one(u, DDS::HANDLE_NIL);
+  
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("MultipleTemp: update_one with already"
-                  ACE_TEXT (" existing instance with DDS::HANDLE_NIL,"
+                  ACE_TEXT ("MultipleTemp: update_one with already")
+                  ACE_TEXT (" existing instance with DDS::HANDLE_NIL,")
                   ACE_TEXT (" key <%C> and key <%C>\n"),
-                  i.keyOne.in(), u.keyTwo.in()));
+                  i.keyOne.in(), u.keyOne.in()));
     }
     catch(const CCM_DDS::NonExistent &)
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Unexpected exception: NonExistent ")
-                            ACE_TEXT ("with test updater update_one.\n"),));
+                            ACE_TEXT ("with test updater update_one.\n")));
       result = false;
     }
     catch (const CCM_DDS::InternalError& )
@@ -135,7 +139,7 @@ namespace CIAO_MultipleTemp_Sender_Impl
   }
 
   CORBA::Boolean
-  Sender_exec_i::create_many()
+  Sender_exec_i::create_many_topics()
   {
     //create many with no exception
     CORBA::Boolean result = false;
@@ -145,7 +149,8 @@ namespace CIAO_MultipleTemp_Sender_Impl
                   ACE_TEXT ("create_many both topics : <%u> samples\n"),
                   this->topic_one_seq_many_.length ()));
       this->updater_one_->create_many (this->topic_one_seq_many_);
-      this->updater_two_->create_many (this->topic_two_seq_many_);
+  //    this->updater_two_->create_many (this->topic_two_seq_many_);
+ 
       result = true;
     }
     catch(const CCM_DDS::NonExistent& )
@@ -165,13 +170,13 @@ namespace CIAO_MultipleTemp_Sender_Impl
   }
 
   CORBA::Boolean
-  Sender_exec_i::update_many()
+  Sender_exec_i::update_many_topics()
   {
     CORBA::Boolean result = false;
     try
     {
       this->updater_one_->update_many (this->topic_one_seq_many_);
-      this->updater_two_->update_many (this->topic_two_seq_many_);
+ //     this->updater_two_->update_many (this->topic_two_seq_many_);
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("update_many : written <%u> samples\n"),
                  this->topic_one_seq_many_.length ()));
       result = true;
@@ -179,7 +184,7 @@ namespace CIAO_MultipleTemp_Sender_Impl
     catch(const CCM_DDS::NonExistent& )
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Unexpected exception: NonExistent "
+                  ACE_TEXT ("Unexpected exception: NonExistent ")
                   ACE_TEXT ("with test updater update_many.\n")));
       result = false;
     }
@@ -190,6 +195,7 @@ namespace CIAO_MultipleTemp_Sender_Impl
                    ex.index, ex.error_code));
       result = false;
     }
+	return result;
   }
 
   void
@@ -231,7 +237,8 @@ namespace CIAO_MultipleTemp_Sender_Impl
         new_key.z = i;
         this->topic_two_seq_one_[i-1] = new_key;
       }
-    //sequence for tests with .._many
+
+	//sequence for tests with .._many
     this->topic_two_seq_many_.length (total);
     for (int i = 1; i < (total + 1); i++)
       {
@@ -254,7 +261,7 @@ namespace CIAO_MultipleTemp_Sender_Impl
       switch (this->test_nr_)
       {
         case UPDATE_CREATE:
-          this->test_ok_ = this->create_one();
+          this->test_ok_ = this->create_one_topic();
           if(this->test_ok_.value())
             {
               this->test_nr_ = UPDATE_ONE;
@@ -265,11 +272,11 @@ namespace CIAO_MultipleTemp_Sender_Impl
             }
           break;
         case UPDATE_ONE:
-          this->test_ok_ = this->update_one();
+          this->test_ok_ = this->update_one_topic();
           this->test_nr_ = CREATE_MANY;
           break;
         case CREATE_MANY:
-          this->test_ok_ = this->create_many();
+          this->test_ok_ = this->create_many_topics();
           if(this->test_ok_.value())
             {
               this->test_nr_ = UPDATE_MANY;
@@ -281,7 +288,7 @@ namespace CIAO_MultipleTemp_Sender_Impl
           this->test_nr_ = UPDATE_MANY;
           break;
         case UPDATE_MANY:
-          this->test_ok_ = this->update_many();
+          this->test_ok_ = this->update_many_topics();
           this->test_nr_ = END_TEST;
           break;
         default:
@@ -331,7 +338,7 @@ namespace CIAO_MultipleTemp_Sender_Impl
     this->updater_one_  =
         this->context_->get_connection_test_topic_one_update_data ();
     this->updater_two_  =
-        this->context_->get_connection_test_topic_one_update_data ();
+        this->context_->get_connection_test_topic_two_update_data ();
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h
index cb31f3131f9..08fa203f6cc 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender_exec.h
@@ -60,22 +60,22 @@ namespace CIAO_MultipleTemp_Sender_Impl
     void start (void);
     void stop (void);
     void add_instances_of_topic (void);
-    CORBA::Boolean create_one(void);
-    CORBA::Boolean update_one(void);
-    CORBA::Boolean create_many(void);
-    CORBA::Boolean update_many(void);
+    CORBA::Boolean create_one_topic(void);
+    CORBA::Boolean update_one_topic(void);
+    CORBA::Boolean create_many_topics(void);
+    CORBA::Boolean update_many_topics(void);
 
     pulse_Generator * ticker_;
     ::MultipleTemp::CCM_Sender_Context_var context_;
-    ::MultipleTemp::MultipleTempConnector::MultipleTemp_var updater_one_;
-    ::MultipleTemp::MultipleTempConnector::MultipleTemp_var updater_two_;
+	::MultipleTemp::MultipleTempConnector::T_Typed::Updater_var updater_one_;
+	::MultipleTemp::MultipleTempConnector::Y_Typed::Updater_var updater_two_;
 
     MULTIPLE_TEMP_TEST test_nr_;
     Atomic_Boolean test_ok_;
     TestTopicOneSeq topic_one_seq_one_;
     TestTopicOneSeq topic_one_seq_many_;
-    TestTopicOneSeq topic_two_seq_one_;
-    TestTopicOneSeq topic_two_seq_many_;
+    TestTopicTwoSeq topic_two_seq_one_;
+    TestTopicTwoSeq topic_two_seq_many_;
 
  };
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr