Tue Jun 12 13:45:28 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp:
          Corrected definition of a nil handle, has a length of zero

        * connectors/dds4ccm/impl/dds4ccm_conf.h:
          Dump the full rti dds handle

        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
          Log file handle

4 files changed, 26 insertions, 9 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 3a1cffecb32..1836fed4dab 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Tue Jun 12 13:45:28 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp:
+          Corrected definition of a nil handle, has a length of zero
+
+        * connectors/dds4ccm/impl/dds4ccm_conf.h:
+          Dump the full rti dds handle
+
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
+          Log file handle
+
 Mon Jun 11 19:09:41 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp
index bb603914e2d..2a86ab58c06 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp
@@ -3,7 +3,7 @@
 
 #include "ndds_dcps_instance_handleC.h"
 
-static ::DDS::InstanceHandle_t S_HANDLE = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 16, 0};
+static ::DDS::InstanceHandle_t S_HANDLE = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 0};
 
 namespace DDS
 {
diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h b/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h
index ef2edb3ba1b..d755f897800 100644
--- a/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h
+++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_conf.h
@@ -35,10 +35,10 @@
 # include "dds4ccm/impl/Utils.h"
 # define DDS_INSTANCE_HANDLE_T_IN const ::DDS::InstanceHandle_t &
 # define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t
-# define DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER ACE_TEXT ("length <%d> - isValid <%d>")
-# 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_FORMAT_SPECIFIER ACE_TEXT ("<%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x:%d:%d>")
+# define DDS_INSTANCE_HANDLE_LOG(X) X.value[0], X.value[1], X.value[2], X.value[3], X.value[4], X.value[5], X.value[6], X.value[7], X.value[8], X.value[9], X.value[10], X.value[11], X.value[12], X.value[13], X.value[14], X.value[15], X.length, X.isValid
+# define DDS_ENTITY_FORMAT_SPECIFIER ACE_TEXT ("<%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x:%d:%d>")
+# define DDS_ENTITY_LOG(X) X->get_instance_handle ().value[0], X->get_instance_handle ().value[1], X->get_instance_handle ().value[2], X->get_instance_handle ().value[3], X->get_instance_handle ().value[4], X->get_instance_handle ().value[5], X->get_instance_handle ().value[6], X->get_instance_handle ().value[7], X->get_instance_handle ().value[8], X->get_instance_handle ().value[9], X->get_instance_handle ().value[10], X->get_instance_handle ().value[11], X->get_instance_handle ().value[12], X->get_instance_handle ().value[13], X->get_instance_handle ().value[14], X->get_instance_handle ().value[15], X->get_instance_handle ().length, X->get_instance_handle ().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
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 1ba2f57c356..bd13cd17729 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
@@ -474,9 +474,12 @@ namespace CIAO_Getter_Test_Receiver_Impl
             ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR FIXED: GET MANY: ")
                     ACE_TEXT ("received instance handle should be invalid ")
                     ACE_TEXT ("for unkeyed data: ")
-                    ACE_TEXT ("key <%u> - iteration <%u>\n"),
+                    ACE_TEXT ("key <%u> - iteration <%u> handle ")
+                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
+                    ACE_TEXT ("\n"),
                     gettertest_info.key,
-                    gettertest_info.iteration));
+                    gettertest_info.iteration,
+                    DDS_INSTANCE_HANDLE_LOG(readinfo.instance_handle)));
           }
         if (readinfo.source_timestamp.sec == 0 &&
             readinfo.source_timestamp.nanosec == 0)
@@ -554,9 +557,12 @@ namespace CIAO_Getter_Test_Receiver_Impl
             ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR VARIABLE: GET MANY: ")
                     ACE_TEXT ("received instance handle should be invalid ")
                     ACE_TEXT ("for unkeyed data: ")
-                    ACE_TEXT ("key <%C> - iteration <%u>\n"),
+                    ACE_TEXT ("key <%C> - iteration <%u> - handle ")
+                    DDS_INSTANCE_HANDLE_FORMAT_SPECIFIER
+                    ACE_TEXT ("\n"),
                     gettertest_info->key.in (),
-                    gettertest_info->iteration));
+                    gettertest_info->iteration,
+                    DDS_INSTANCE_HANDLE_LOG(readinfo.instance_handle)));
           }
         if (readinfo.source_timestamp.sec == 0 &&
             readinfo.source_timestamp.nanosec == 0)