Tue Feb 23 14:34:59 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * bin/ciao_tests.lst:
          CSLUnexpStat is not ready, yet.

        * connectors/dds4ccm/impl/ndds/Getter_T.cpp:
          Layout changes.

        * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp:
        * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl:
        * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp:
        * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl:
          Resolved deployment errors related to generation of the connector
          code.

7 files changed, 30 insertions, 15 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 7db042cd1e4..becdff11c62 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,8 +1,23 @@
+Tue Feb 23 14:34:59 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/ciao_tests.lst:
+          CSLUnexpStat is not ready, yet.
+
+        * connectors/dds4ccm/impl/ndds/Getter_T.cpp:
+          Layout changes.
+
+        * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl:
+        * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp:
+        * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl:
+          Resolved deployment errors related to generation of the connector
+          code.
+
 Tue Feb 23 14:28:22 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h:
 
-          Missing file. 
+          Missing file.
 
 Tue Feb 23 13:25:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst
index 1676fde1f4e..a86ac4761de 100644
--- a/CIAO/bin/ciao_tests.lst
+++ b/CIAO/bin/ciao_tests.lst
@@ -56,7 +56,7 @@ TAO/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: !STATIC !
 TAO/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
-TAO/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
+TAO/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp
index defba25b8d9..247a8eed7c9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp
@@ -46,7 +46,7 @@ CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::wait (
 {
   DDS_Duration_t timeout;
   timeout <<= this->time_out_;
-  DDS_ReturnCode_t const retcode = ws_->wait (active_conditions, timeout);
+  DDS_ReturnCode_t const retcode = this->ws_->wait (active_conditions, timeout);
   if (retcode == DDS_RETCODE_TIMEOUT)
     {
       DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("Getter: No data available after timeout.\n")));
@@ -247,8 +247,8 @@ CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::set_impl (
       // Now create the waitset conditions
       this->ws_ = new DDSWaitSet ();
       this->rd_condition_ = this->impl ()->create_readcondition (DDS_NOT_READ_SAMPLE_STATE,
-                                                         DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-                                                         DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE);
+                                                       DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
+                                                       DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE);
       DDS_ReturnCode_t retcode = this->ws_->attach_condition (this->rd_condition_);
       if (retcode != DDS_RETCODE_OK)
         {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
index 7d5d4f75c17..db172c0ec60 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
@@ -123,7 +123,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_VT_String_VT_String_Connector_Impl</string>
+          <string>create_VTopic_VT_String_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -175,7 +175,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_VT_Array_VT_Array_Connector_Impl</string>
+          <string>create_VTopic_VT_Array_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -227,7 +227,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_VT_Seq_VT_Seq_Connector_Impl</string>
+          <string>create_VTopic_VT_Seq_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
index ea40bfa72ca..6065a5cc28b 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
@@ -218,8 +218,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) {
     }
 }
 
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
+print "Sleeping 10 seconds to allow task to complete\n";
+sleep (10);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp
index f4f20d7f3a2..1296410de1d 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp
@@ -123,7 +123,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_VTS_String_VTS_String_Connector_Impl</string>
+          <string>create_VTopics_VTS_String_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -175,7 +175,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_VTS_Array_VTS_Array_Connector_Impl</string>
+          <string>create_VTopics_VTS_Array_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -227,7 +227,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_VTS_Seq_VTS_Seq_Connector_Impl</string>
+          <string>create_VTopics_VTS_Seq_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
index ea40bfa72ca..6065a5cc28b 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
@@ -218,8 +218,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) {
     }
 }
 
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
+print "Sleeping 10 seconds to allow task to complete\n";
+sleep (10);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";