Mon Jun 11 12:37:55 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h:
        * connectors/dds4ccm/impl/dds4ccm_conf.h:
        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
        * connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h:
        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp:
        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp:
        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp:
          The concept of invalid instance handles is RTI NDDS specific. Removed
          the macros for that, but just compare the instance handles with nil
          instead of checking the isValid

20 files changed, 72 insertions, 52 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 84110d14dc7..446bbac265a 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,28 @@
+Mon Jun 11 12:37:55 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h:
+        * connectors/dds4ccm/impl/dds4ccm_conf.h:
+        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
+        * connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h:
+        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp:
+          The concept of invalid instance handles is RTI NDDS specific. Removed
+          the macros for that, but just compare the instance handles with nil
+          instead of checking the isValid
+
 Sun Jun 10 18:39:26 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h
index 44c07445031..e03f62cee86 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h
@@ -23,6 +23,22 @@ namespace DDS
   extern NDDS_STUB_Export ::DDS::InstanceHandle_t const HANDLE_NIL;
 }
 
+inline bool
+operator== (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2)
+{
+  return instancehandle1.length  == instancehandle2.length  &&
+         instancehandle1.isValid == instancehandle2.isValid &&
+         ACE_OS::memcmp (instancehandle1.value, instancehandle2.value, sizeof (instancehandle1.value)) == 0;
+}
+
+inline bool
+operator!= (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2)
+{
+  return instancehandle1.length  != instancehandle2.length  ||
+         instancehandle1.isValid != instancehandle2.isValid ||
+         ACE_OS::memcmp (instancehandle1.value, instancehandle2.value, sizeof (instancehandle1.value)) != 0;
+}
+
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h b/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h
index c1ec5b9f34a..ef2edb3ba1b 100644
--- a/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h
+++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h
@@ -39,8 +39,6 @@
 # define DDS_INSTANCE_HANDLE_LOG(X) X.length, X.isValid
 # define DDS_ENTITY_FORMAT_SPECIFIER ACE_TEXT ("length <%d> - isValid <%d>")
 # define DDS_ENTITY_LOG(X) X->get_instance_handle ().length, X->get_instance_handle ().isValid
-# define DDS_INSTANCE_HANDLE_VALID(X) X.isValid
-# define DDS_INSTANCE_HANDLE_INVALID(X) !X.isValid
 # define DDS_XML_QOS_PARSER_TYPE CIAO::DDS4CCM::QOS_XML_Noop
 #elif (CIAO_DDS4CCM_OPENDDS==1)
 # define DDS_INSTANCE_HANDLE_T_IN ::DDS::InstanceHandle_t
@@ -49,8 +47,6 @@
 # define DDS_INSTANCE_HANDLE_LOG(X) X
 # define DDS_ENTITY_FORMAT_SPECIFIER ACE_TEXT ("<%d:%@>")
 # define DDS_ENTITY_LOG(X) X->get_instance_handle (), X
-# define DDS_INSTANCE_HANDLE_VALID(X) true
-# define DDS_INSTANCE_HANDLE_INVALID(X) false
 # define DDS_XML_QOS_PARSER_TYPE OpenDDS::DCPS::QOS_XML_Loader
 #endif
 #endif /* DDS4CCM_CONF_H_ */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp
index a9e80f40fc5..df8fb93c3c5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.cpp
@@ -34,7 +34,7 @@ namespace CIAO
           DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO
                         "DDS_TypeSupport_i::get_factory_i - "
                         "A factory of type <%C> and with DomainParticipant <%@> "
-                        "is registered\n",
+                        "has been registered\n",
                         type,
                         dp));
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h b/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h
index 8096087282f..24f9a91e8f9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/convertors/InstanceHandle_t.h
@@ -30,14 +30,6 @@ operator<<= (::DDS_InstanceHandle_t &ddsinstancehandle, const ::DDS::InstanceHan
 }
 
 inline bool
-operator== (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2)
-{
-  return instancehandle1.length  == instancehandle2.length  &&
-         instancehandle1.isValid == instancehandle2.isValid &&
-         ACE_OS::memcmp (instancehandle1.value, instancehandle2.value, sizeof (instancehandle1.value)) == 0;
-}
-
-inline bool
 operator== (const DDS_InstanceHandle_t & dds_instancehandle, const ::DDS::InstanceHandle_t & ccm_instancehandle)
 {
   return dds_instancehandle.keyHash.length  == ccm_instancehandle.length  &&
@@ -54,14 +46,6 @@ operator== (const ::DDS::InstanceHandle_t & ccm_instancehandle, const DDS_Instan
 }
 
 inline bool
-operator!= (const ::DDS::InstanceHandle_t & instancehandle1, const ::DDS::InstanceHandle_t & instancehandle2)
-{
-  return instancehandle1.length  != instancehandle2.length  ||
-         instancehandle1.isValid != instancehandle2.isValid ||
-         ACE_OS::memcmp (instancehandle1.value, instancehandle2.value, sizeof (instancehandle1.value)) != 0;
-}
-
-inline bool
 operator!= (const DDS_InstanceHandle_t & dds_instancehandle, const ::DDS::InstanceHandle_t & ccm_instancehandle)
 {
   return dds_instancehandle.keyHash.length != ccm_instancehandle.length  ||
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
index d5fd4c593c0..bf2d4bf034d 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
@@ -10,10 +10,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "dds4ccm/impl/dds4ccm_conf.h"
 
-#if (CIAO_DDS4CCM_NDDS==1)
-# include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
-#endif
-
 namespace CIAO_CSL_DeadlineTest_Sender_Impl
 {
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
index f738064f0ac..a14f1605cdc 100644
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp
@@ -69,7 +69,7 @@ namespace CIAO_CFTLE_Test_Receiver_Impl
                           "key <%C> - iteration <%d>\n",
                           datum.key.in (),
                           datum.iteration));
-    if (!DDS_INSTANCE_HANDLE_VALID(info.instance_handle))
+    if (info.instance_handle == ::DDS::HANDLE_NIL)
       {
         ACE_ERROR ((LM_ERROR, "ERROR: ContentFilteredTopicListenEventTest_Listener::on_one_data: "
                               "instance handle seems to be invalid "
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp
index 27034b9c969..1ca4c4d5be5 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp
@@ -123,7 +123,7 @@ namespace CIAO_Writer_Sender_Impl
     for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
       {
         DDS_InstanceHandle_t const hnd = this->writer_->register_instance (i->second);
-        if (DDS_INSTANCE_HANDLE_INVALID(hnd))
+        if (hnd == ::DDS::HANDLE_NIL)
           {
             ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to register handle for <%C> - iteration <%d>\n"),
               i->first.c_str (), i->second->iteration));
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
index f5a6c926505..1ba2f57c356 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
@@ -469,7 +469,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
                                   gettertest_info.iteration));
           }
         // check readinfo struct.
-        if (DDS_INSTANCE_HANDLE_VALID(readinfo.instance_handle))
+        if (readinfo.instance_handle != ::DDS::HANDLE_NIL)
           {
             ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR FIXED: GET MANY: ")
                     ACE_TEXT ("received instance handle should be invalid ")
@@ -549,7 +549,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
                                   gettertest_info->iteration));
           }
         // check readinfo struct.
-        if (DDS_INSTANCE_HANDLE_VALID(readinfo.instance_handle))
+        if (readinfo.instance_handle != ::DDS::HANDLE_NIL)
           {
             ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR VARIABLE: GET MANY: ")
                     ACE_TEXT ("received instance handle should be invalid ")
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
index f2db49e8acd..5e90e616bb1 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
@@ -32,7 +32,6 @@
 #include "Connector/Writer_Connector_conn.h"
 #include "dds4ccm/impl/Utils.h"
 #if (CIAO_DDS4CCM_NDDS == 1)
-# include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h"
 # include "dds4ccm/impl/ndds/DataWriter_T.h"
 #endif
 
@@ -131,7 +130,7 @@ namespace CIAO_Writer_Sender_Impl
       {
         DDS::InstanceHandle_t const hnd =
           ccm_writer->register_instance (i->second);
-        if (DDS_INSTANCE_HANDLE_INVALID(hnd))
+        if (hnd == ::DDS::HANDLE_NIL)
           {
             ACE_ERROR ((LM_ERROR,
                         ACE_TEXT ("ERROR: Unable to register handle for <%C>\n"),
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
index 7d84ff9d6d6..c618225f7fb 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp
@@ -213,7 +213,7 @@ namespace CIAO_Writer_Sender_Impl
 
     Writer_Table::iterator i = this->ktests_.begin ();
     ::DDS::InstanceHandle_t hnd = writer->register_instance (i->second);
-    if (DDS_INSTANCE_HANDLE_INVALID(hnd))
+    if (hnd == ::DDS::HANDLE_NIL)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to register handle for <%C> - iteration <%d>\n"),
           i->first.c_str (), i->second->iteration));
@@ -228,7 +228,7 @@ namespace CIAO_Writer_Sender_Impl
     // Test exception. In Qos, max_instances is set to 1
     // so only one instance may be registered.
     hnd = writer->register_instance (i->second);
-    if (DDS_INSTANCE_HANDLE_VALID(hnd))
+    if (hnd != ::DDS::HANDLE_NIL)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Shouldn't be able to register instance for <%C> - iteration <%d>\n"),
           i->first.c_str (), i->second->iteration));
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
index bcd9eb7745e..b2b8dffeb42 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
@@ -48,10 +48,10 @@ namespace CIAO_LMBM_Test_Receiver_Impl
                                "key <%C> - iteration <%d>\n",
                                an_instance[i].key.in (),
                                an_instance[i].iteration));
-        if (DDS_INSTANCE_HANDLE_INVALID(info[i].instance_handle))
+        if (info[i].instance_handle == ::DDS::HANDLE_NIL)
           {
             ACE_ERROR ((LM_ERROR, "ERROR: ListenManyByManyTest_Listener_exec_i::on_many_data:"
-                                "instance handle %d seems to be invalid"
+                                "instance handle %d seems to be nil"
                                 "key <%C> - iteration <%d>\n",
                                  i,
                                  an_instance[i].key.in (),
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
index 38d20f2a635..634729911c9 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
@@ -36,10 +36,10 @@ namespace CIAO_LOBO_Test_Receiver_Impl
                             "key <%C> - iteration <%d>\n",
                             an_instance.key.in (),
                             an_instance.iteration));
-    if (DDS_INSTANCE_HANDLE_INVALID (info.instance_handle))
+    if (info.instance_handle == ::DDS::HANDLE_NIL)
       {
         ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "instance handle seems to be invalid "
+                            "instance handle seems to be nil "
                             "key <%C> - iteration <%d>\n",
                             an_instance.key.in (),
                             an_instance.iteration));
@@ -48,7 +48,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl
         info.source_timestamp.nanosec == 0)
       {
         ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
+                            "source timestamp seems to be nil (nil) "
                             "key <%C> - iteration <%d>\n",
                             an_instance.key.in (),
                             an_instance.iteration));
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 3d89802249b..f18261454de 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp
@@ -41,7 +41,7 @@ namespace CIAO_MultipleTemp_Receiver_Impl
                             "key <%C> - x <%d>\n",
                             an_instance.keyOne.in (),
                             an_instance.x));
-    if (DDS_INSTANCE_HANDLE_INVALID (info.instance_handle))
+    if ( info.instance_handle == ::DDS::HANDLE_NIL)
       {
         ACE_ERROR ((LM_ERROR, "ERROR: ListenOne_Listener_exec_i::on_one_data: "
                             "instance handle seems to be invalid "
@@ -90,7 +90,7 @@ namespace CIAO_MultipleTemp_Receiver_Impl
                               "key <%C> - y <%d>\n",
                               an_instance.keyTwo.in (),
                               an_instance.y));
-      if (DDS_INSTANCE_HANDLE_INVALID (info.instance_handle))
+      if (::DDS::HANDLE_NIL == info.instance_handle)
         {
           ACE_ERROR ((LM_ERROR, "ERROR: ListenTwo_Listener_exec_i::on_one_data: "
                               "instance handle seems to be invalid "
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
index e89a04643c4..b1554aa2f03 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp
@@ -72,7 +72,7 @@ namespace CIAO_QCLE_Test_Receiver_Impl
                             "key <%C> - iteration <%d>\n",
                             datum.key.in (),
                             datum.iteration));
-    if (DDS_INSTANCE_HANDLE_INVALID (info.instance_handle))
+    if (info.instance_handle == ::DDS::HANDLE_NIL)
       {
         ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionListenEventTest_Listener::on_one_data: "
                             "instance handle seems to be invalid "
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
index 92b61399a6d..edf48371ed3 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp
@@ -73,7 +73,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl
                             "key <%C> - iteration <%d>\n",
                             datum.key.in (),
                             datum.iteration));
-    if (DDS_INSTANCE_HANDLE_INVALID(info.instance_handle))
+    if (::DDS::HANDLE_NIL == info.instance_handle)
       {
         ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_1::on_one_data: "
                             "instance handle seems to be invalid "
@@ -170,7 +170,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl
                             "key <%C> - iteration <%d>\n",
                             datum.key.in (),
                             datum.iteration));
-    if (DDS_INSTANCE_HANDLE_INVALID(info.instance_handle))
+    if (::DDS::HANDLE_NIL == info.instance_handle)
       {
         ACE_ERROR ((LM_ERROR, "ERROR: QueryConditionTwoListenersTest_Listener_2::on_one_data: "
                             "instance handle seems to be invalid "
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
index 6cf446c889f..73999fd53b3 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
@@ -459,7 +459,7 @@ namespace CIAO_Reader_Test_Receiver_Impl
                     ++nr_keys_changed;
                   }
                 // check readinfo struct.
-                if (DDS_INSTANCE_HANDLE_INVALID(readinfo_seq[it].instance_handle))
+                if (::DDS::HANDLE_NIL == readinfo_seq[it].instance_handle)
                   {
                     ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
                             ACE_TEXT ("received instance handle should be valid ")
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
index 8cd1b668745..c780b7ebe9d 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
@@ -59,12 +59,16 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl
             ACE_TEXT ("received keyed_test_info for <%C> at %u\n"),
             datum.key.in (),
             datum.iteration));
-    if (DDS_INSTANCE_HANDLE_VALID (info.instance_handle))
+    if (info.instance_handle != ::DDS::HANDLE_NIL)
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: UnkeyedTest_Listener::on_one_data: ")
-                ACE_TEXT ("received instance handle should be invalid ")
+        ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("ERROR: UnkeyedTest_Listener::on_one_data: ")
+                ACE_TEXT ("received instance handle ")
+                DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
+                ACE_TEXT (" should be invalid ")
                 ACE_TEXT ("for unkeyed data ")
                 ACE_TEXT ("key <%C> - iteration <%u>\n"),
+                DDS_INSTANCEHANDLE_LOG (info.instance_handle),
                 datum.key.in (),
                 datum.iteration));
       }
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
index ee5c150dad3..8d7f3988738 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
@@ -62,7 +62,7 @@ namespace CIAO_Updater_Receiver_Impl
                             "key <%C> - iteration <%d>\n",
                             datum.key.in (),
                             datum.x));
-    if (DDS_INSTANCE_HANDLE_INVALID (info.instance_handle))
+    if (::DDS::HANDLE_NIL == info.instance_handle)
       {
         ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
                             "instance handle seems to be invalid "
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
index 28774196cf3..dfbe68388b3 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp
@@ -258,15 +258,15 @@ namespace CIAO_Updater_Sender_Impl
   Sender_exec_i::update_and_delete_one_after_register (
     ::Updater::UpdaterConnector::Updater_ptr updater)
   {
-    //update an instance after registering first, using a handle
+    // Update an instance after registering first, using a handle
     TestTopic i = this->topic_seq_one_[2];
-    //take third instance of table
+    // Take third instance of table
     DDS::InstanceHandle_t const hnd = updater->register_instance(i);
     try
       {
-        if (DDS_INSTANCE_HANDLE_VALID(hnd))
+        if (hnd != ::DDS::HANDLE_NIL)
           {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update a new  instance after registering instance, key <%C>\n"),
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: update a new instance after registering instance, key <%C>\n"),
                         i.key.in ()));
             updater->update_one(i, hnd);
           }