Fri Aug 12 07:24:01 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp:
        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
          Reverted change of yesterday, breaks the dds4ccm tests that don't
          have a QoS file

6 files changed, 58 insertions, 45 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index cd44d4ce33c..09973632e41 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Fri Aug 12 07:24:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp:
+        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
+        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
+        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
+        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
+          Reverted change of yesterday, breaks the dds4ccm tests that don't
+          have a QoS file
+
 Thu Aug 11 13:34:51 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/Writer_T.cpp:
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp
index 5511e493a9c..ffc0bd86343 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.cpp
@@ -42,7 +42,7 @@ namespace CIAO
     DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::set_qos (const ::DDS::DataWriterQos & qos)
     {
       DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::set_qos");
-      ::DDS_DataWriterQos ccm_dds_qos = DDS_DATAWRITER_QOS_DEFAULT;
+      ::DDS_DataWriterQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return this->rti_entity ()->set_qos (ccm_dds_qos);
     }
@@ -52,7 +52,7 @@ namespace CIAO
     DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_qos (::DDS::DataWriterQos & qos)
     {
       DDS4CCM_TRACE ("DataWriter_T<TYPED_DDS_WRITER, TYPED_WRITER_TYPE, VALUE_TYPE>::get_qos");
-      ::DDS_DataWriterQos ccm_dds_qos = DDS_DATAWRITER_QOS_DEFAULT;
+      ::DDS_DataWriterQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       ::DDS::ReturnCode_t retcode = this->rti_entity ()->get_qos (ccm_dds_qos);
       qos <<= ccm_dds_qos;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
index 0a33daa29a8..723c1824697 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
@@ -126,13 +126,12 @@ namespace CIAO
       ::DDS::StatusMask mask)
     {
       DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher");
-
+      ACE_UNUSED_ARG (qos);
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
                     "DDS_DomainParticipant_i::create_publisher - "
                     "Start creating Publisher\n"));
 
       DDS_PublisherQos ccm_dds_qos = DDS_PUBLISHER_QOS_DEFAULT;
-      ccm_dds_qos <<= qos;
 
       DDS_PublisherListener_i *ccm_dds_pl = 0;
       if (! ::CORBA::is_nil (a_listener))
@@ -306,6 +305,8 @@ namespace CIAO
     {
       DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber");
 
+      ACE_UNUSED_ARG (qos);
+
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
                     "DDS_DomainParticipant_i::create_subscriber - "
                     "Creating Subscriber\n"));
@@ -319,11 +320,10 @@ namespace CIAO
         }
 
       DDS_SubscriberQos ccm_dds_qos = DDS_SUBSCRIBER_QOS_DEFAULT;
-      ccm_dds_qos <<= qos;
       DDSSubscriber * ccm_dds_sub =
-        this->rti_entity ()->create_subscriber (ccm_dds_qos,
-                                                ccm_dds_sl,
-                                                mask);
+      this->rti_entity ()->create_subscriber (ccm_dds_qos,
+                                        ccm_dds_sl,
+                                        mask);
 
       if (!ccm_dds_sub)
         {
@@ -395,6 +395,7 @@ namespace CIAO
       return retval;
     }
 
+
     ::DDS::Subscriber_ptr
     DDS_DomainParticipant_i::get_builtin_subscriber (void)
     {
@@ -409,6 +410,7 @@ namespace CIAO
       return retval._retn ();
     }
 
+
     ::DDS::Topic_ptr
     DDS_DomainParticipant_i::create_topic (
                                             const char * impl_name,
@@ -419,9 +421,11 @@ namespace CIAO
     {
       DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic");
 
+      ACE_UNUSED_ARG (qos);
+
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_DEBUG, DDS4CCM_INFO
                     "DDS_DomainParticipant_i::create_topic - "
-                    "Attempting to create topic with name <%C> and type <%C>\n",
+                    "Attempting to create topic with name %C and type %C\n",
                     impl_name, type_name));
 
       DDS_TopicListener_i *ccm_dds_tl = 0;
@@ -433,6 +437,8 @@ namespace CIAO
                             ::CORBA::NO_MEMORY ());
         }
 
+      DDS_TopicQos ccm_dds_qos = DDS_TOPIC_QOS_DEFAULT;
+
       DDSTopicDescription * dds_td =
         this->rti_entity ()->lookup_topicdescription (impl_name);
       DDSTopic * dds_tp = 0;
@@ -443,14 +449,11 @@ namespace CIAO
 
       if (!dds_tp)
         {
-          DDS_TopicQos ccm_dds_qos = DDS_TOPIC_QOS_DEFAULT;
-          ccm_dds_qos <<= qos;
-
           dds_tp = this->rti_entity ()->create_topic (impl_name,
-                                                      type_name,
-                                                      ccm_dds_qos,
-                                                      ccm_dds_tl,
-                                                      mask);
+                                                type_name,
+                                                ccm_dds_qos,
+                                                ccm_dds_tl,
+                                                mask);
 
           if (!dds_tp)
             {
@@ -846,7 +849,7 @@ namespace CIAO
       const ::DDS::DomainParticipantQos & qos)
     {
       DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_qos");
-      ::DDS_DomainParticipantQos ccm_dds_qos = DDS_PARTICIPANT_QOS_DEFAULT;
+      ::DDS_DomainParticipantQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return this->rti_entity ()->set_qos (ccm_dds_qos);
     }
@@ -857,7 +860,7 @@ namespace CIAO
       ::DDS::DomainParticipantQos & qos)
     {
       DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_qos");
-      ::DDS_DomainParticipantQos ccm_dds_qos = DDS_PARTICIPANT_QOS_DEFAULT;
+      ::DDS_DomainParticipantQos ccm_dds_qos;
       ::DDS::ReturnCode_t retcode = this->rti_entity ()-> get_qos (ccm_dds_qos);
       qos <<= ccm_dds_qos;
       return retcode;
@@ -974,7 +977,7 @@ namespace CIAO
       const ::DDS::PublisherQos & qos)
     {
       DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_publisher_qos");
-      ::DDS_PublisherQos ccm_dds_qos = DDS_PUBLISHER_QOS_DEFAULT;
+      ::DDS_PublisherQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return this->rti_entity ()->set_default_publisher_qos (ccm_dds_qos);
     }
@@ -985,7 +988,7 @@ namespace CIAO
       ::DDS::PublisherQos & qos)
     {
       DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_publisher_qos");
-      ::DDS_PublisherQos ccm_dds_qos = DDS_PUBLISHER_QOS_DEFAULT;
+      ::DDS_PublisherQos ccm_dds_qos;
       ::DDS::ReturnCode_t retcode = this->rti_entity ()-> get_default_publisher_qos (ccm_dds_qos);
       qos <<= ccm_dds_qos;
       return retcode;
@@ -997,7 +1000,7 @@ namespace CIAO
       const ::DDS::SubscriberQos & qos)
     {
       DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_subscriber_qos");
-      ::DDS_SubscriberQos ccm_dds_qos = DDS_SUBSCRIBER_QOS_DEFAULT;
+      ::DDS_SubscriberQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return this->rti_entity ()->set_default_subscriber_qos (ccm_dds_qos);
     }
@@ -1008,7 +1011,7 @@ namespace CIAO
       ::DDS::SubscriberQos & qos)
     {
       DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_subscriber_qos");
-      ::DDS_SubscriberQos ccm_dds_qos = DDS_SUBSCRIBER_QOS_DEFAULT;
+      ::DDS_SubscriberQos ccm_dds_qos;
       ::DDS::ReturnCode_t retcode =
             this->rti_entity ()-> get_default_subscriber_qos (ccm_dds_qos);
       qos <<= ccm_dds_qos;
@@ -1021,7 +1024,7 @@ namespace CIAO
       const ::DDS::TopicQos & qos)
     {
       DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_topic_qos");
-      ::DDS_TopicQos ccm_dds_qos = DDS_TOPIC_QOS_DEFAULT;
+      ::DDS_TopicQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return this->rti_entity ()->set_default_topic_qos (ccm_dds_qos);
     }
@@ -1032,13 +1035,14 @@ namespace CIAO
       ::DDS::TopicQos & qos)
     {
       DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_topic_qos");
-      ::DDS_TopicQos ccm_dds_qos = DDS_TOPIC_QOS_DEFAULT;
+      ::DDS_TopicQos ccm_dds_qos;
       ::DDS::ReturnCode_t retcode =
             this->rti_entity ()-> get_default_topic_qos (ccm_dds_qos);
       qos <<= ccm_dds_qos;
       return retcode;
     }
 
+
     ::DDS::ReturnCode_t
     DDS_DomainParticipant_i::get_discovered_participants (
       ::DDS::InstanceHandleSeq & impl_handles)
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
index b518696145a..16d51ee41e5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
@@ -32,6 +32,8 @@ namespace CIAO
     {
       DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::create_participant");
 
+      ACE_UNUSED_ARG (qos);
+
       DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO
                     "DDS_DomainParticipantFactory_i::create_participant - "
                     "Start creating domain participant for domain <%d>\n",
@@ -52,11 +54,9 @@ namespace CIAO
 
       if (!dds_dp)
         {
-          DDS_DomainParticipantQos ccm_dds_qos = DDS_PARTICIPANT_QOS_DEFAULT;
-          ccm_dds_qos <<= qos;
           dds_dp = DDSDomainParticipantFactory::get_instance ()->
                       create_participant (domain_id,
-                                          ccm_dds_qos,
+                                          DDS_PARTICIPANT_QOS_DEFAULT,
                                           ccm_dds_dpl,
                                           mask);
 
@@ -294,7 +294,7 @@ namespace CIAO
     {
       DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::"
         "set_default_participant_qos");
-      DDS_DomainParticipantQos ccm_dds_qos = DDS_PARTICIPANT_QOS_DEFAULT;
+      DDS_DomainParticipantQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return DDSDomainParticipantFactory::get_instance ()->
         set_default_participant_qos (ccm_dds_qos);
@@ -307,7 +307,7 @@ namespace CIAO
     {
       DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::"
         "get_default_participant_qos");
-      DDS_DomainParticipantQos ccm_dds_qos = DDS_PARTICIPANT_QOS_DEFAULT;
+      DDS_DomainParticipantQos ccm_dds_qos;
       ::DDS::ReturnCode_t retcode =
         DDSDomainParticipantFactory::get_instance ()->
           get_default_participant_qos (ccm_dds_qos);
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
index acc2ee1d381..1bbf621046e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
@@ -39,7 +39,7 @@ namespace CIAO
     ::DDS::DataWriter_ptr
     DDS_Publisher_i::create_datawriter (
       ::DDS::Topic_ptr a_topic,
-      const ::DDS::DataWriterQos &qos,
+      const ::DDS::DataWriterQos &,
       ::DDS::DataWriterListener_ptr a_listener,
       ::DDS::StatusMask mask)
     {
@@ -63,7 +63,6 @@ namespace CIAO
                             ::CORBA::NO_MEMORY ());
         }
       DDS_DataWriterQos ccm_dds_qos = DDS_DATAWRITER_QOS_DEFAULT;
-      ccm_dds_qos <<= qos;
       DDSDataWriter *ccm_dds_dw = this->rti_entity ()->create_datawriter (
                                                             topic->get_rti_entity (),
                                                             ccm_dds_qos,
@@ -226,7 +225,7 @@ namespace CIAO
     DDS_Publisher_i::set_qos (const ::DDS::PublisherQos & qos)
     {
       DDS4CCM_TRACE ("DDS_Publisher_i::set_qos");
-      ::DDS_PublisherQos ccm_dds_qos = DDS_PUBLISHER_QOS_DEFAULT;
+      ::DDS_PublisherQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return this->rti_entity ()->set_qos (ccm_dds_qos);
     }
@@ -236,7 +235,7 @@ namespace CIAO
     DDS_Publisher_i::get_qos (::DDS::PublisherQos & qos)
     {
       DDS4CCM_TRACE ("DDS_Publisher_i::get_qos");
-      ::DDS_PublisherQos ccm_dds_qos = DDS_PUBLISHER_QOS_DEFAULT;
+      ::DDS_PublisherQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       ::DDS::ReturnCode_t retcode = this->rti_entity ()->
               get_qos (ccm_dds_qos);
@@ -350,7 +349,7 @@ namespace CIAO
     DDS_Publisher_i::set_default_datawriter_qos (const ::DDS::DataWriterQos & qos)
     {
       DDS4CCM_TRACE ("DDS_Publisher_i::set_default_datawriter_qos");
-      ::DDS_DataWriterQos ccm_dds_qos = DDS_DATAWRITER_QOS_DEFAULT;
+      ::DDS_DataWriterQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return this->rti_entity ()->set_default_datawriter_qos (ccm_dds_qos);
     }
@@ -360,7 +359,7 @@ namespace CIAO
     DDS_Publisher_i::get_default_datawriter_qos (::DDS::DataWriterQos & qos)
     {
       DDS4CCM_TRACE ("DDS_Publisher_i::get_default_datawriter_qos");
-      ::DDS_DataWriterQos ccm_dds_qos = DDS_DATAWRITER_QOS_DEFAULT;
+      ::DDS_DataWriterQos ccm_dds_qos;
       ::DDS::ReturnCode_t retcode =
             this->rti_entity ()->get_default_datawriter_qos (ccm_dds_qos);
       qos <<= ccm_dds_qos;
@@ -373,8 +372,8 @@ namespace CIAO
                                               const ::DDS::TopicQos & a_impl_qos)
     {
       DDS4CCM_TRACE ("DDS_Publisher_i::copy_from_topic_qos");
-      ::DDS_DataWriterQos ccm_dds_qos = DDS_DATAWRITER_QOS_DEFAULT;
-      ::DDS_TopicQos ccm_dds_topic_qos = DDS_TOPIC_QOS_DEFAULT;
+      ::DDS_DataWriterQos ccm_dds_qos;
+      ::DDS_TopicQos ccm_dds_topic_qos;
 
       ccm_dds_qos <<= a_dataimpl_qos;
       ccm_dds_topic_qos <<= a_impl_qos;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
index 39ea868a698..8433c84a3c9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
@@ -79,8 +79,8 @@ namespace CIAO
                   ::DDS::StatusMask mask,
                    const ::DDS::DataReaderQos & qos)
     {
+      ACE_UNUSED_ARG (qos);
       DDS_DataReaderQos ccm_dds_qos = DDS_DATAREADER_QOS_DEFAULT;
-      ccm_dds_qos <<= qos;
       return this->rti_entity ()->create_datareader (topic,
                                                ccm_dds_qos,
                                                ccm_dds_drl,
@@ -94,8 +94,8 @@ namespace CIAO
                   ::DDS::StatusMask mask,
                    const ::DDS::DataReaderQos & qos)
     {
+      ACE_UNUSED_ARG (qos);
       DDS_DataReaderQos ccm_dds_qos = DDS_DATAREADER_QOS_DEFAULT;
-      ccm_dds_qos <<= qos;
       return this->rti_entity ()->create_datareader (topic,
                                                ccm_dds_qos,
                                                ccm_dds_drl,
@@ -405,7 +405,7 @@ namespace CIAO
       const ::DDS::SubscriberQos & qos)
     {
       DDS4CCM_TRACE ("DDS_Subscriber_i::set_qos");
-      ::DDS_SubscriberQos ccm_dds_qos = DDS_SUBSCRIBER_QOS_DEFAULT;
+      ::DDS_SubscriberQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return this->rti_entity ()->get_qos (ccm_dds_qos);
     }
@@ -416,7 +416,7 @@ namespace CIAO
       ::DDS::SubscriberQos & qos)
     {
       DDS4CCM_TRACE ("DDS_Subscriber_i::get_qos");
-      ::DDS_SubscriberQos ccm_dds_qos = DDS_SUBSCRIBER_QOS_DEFAULT;
+      ::DDS_SubscriberQos ccm_dds_qos;
       ::DDS::ReturnCode_t retcode = this->rti_entity ()->get_qos (ccm_dds_qos);
       qos <<= ccm_dds_qos;
       return retcode;
@@ -504,7 +504,7 @@ namespace CIAO
       const ::DDS::DataReaderQos & qos)
     {
       DDS4CCM_TRACE ("DDS_Subscriber_i::set_default_datareader_qos");
-      ::DDS_DataReaderQos ccm_dds_qos = DDS_DATAREADER_QOS_DEFAULT;
+      ::DDS_DataReaderQos ccm_dds_qos;
       ccm_dds_qos <<= qos;
       return this->rti_entity ()->set_default_datareader_qos (ccm_dds_qos);
     }
@@ -515,7 +515,7 @@ namespace CIAO
       ::DDS::DataReaderQos & qos)
     {
       DDS4CCM_TRACE ("DDS_Subscriber_i::get_default_datareader_qos");
-      ::DDS_DataReaderQos ccm_dds_qos = DDS_DATAREADER_QOS_DEFAULT;
+      ::DDS_DataReaderQos ccm_dds_qos;
       ::DDS::ReturnCode_t retcode = this->rti_entity ()->get_default_datareader_qos (ccm_dds_qos);
       qos <<= ccm_dds_qos;
       return retcode;
@@ -528,8 +528,8 @@ namespace CIAO
       const ::DDS::TopicQos & a_impl_qos)
     {
       DDS4CCM_TRACE ("DDS_Subscriber_i::copy_from_topic_qos");
-      ::DDS_DataReaderQos ccm_dds_qos = DDS_DATAREADER_QOS_DEFAULT;
-      ::DDS_TopicQos ccm_dds_topic_qos = DDS_TOPIC_QOS_DEFAULT;
+      ::DDS_DataReaderQos ccm_dds_qos;
+      ::DDS_TopicQos ccm_dds_topic_qos;
 
       ccm_dds_qos <<= a_datareader_qos;
       ccm_dds_topic_qos <<= a_impl_qos;