Wed Aug 4 18:01:14 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/DataReaderListener_T.cpp:
        * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp:
        * connectors/dds4ccm/impl/PortStatusListener_T.cpp:
        * connectors/dds4ccm/impl/PublisherListener_T.cpp:
        * connectors/dds4ccm/impl/SubscriberListener_T.cpp:
        * connectors/dds4ccm/impl/TopicListener_T.cpp:
          Log the dds status masks with %x and added the logging to some more
          methods

8 files changed, 66 insertions, 39 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 3eb7ead27e7..6f9edfaa971 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Wed Aug  4 18:01:14 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/DataReaderListener_T.cpp:
+        * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp:
+        * connectors/dds4ccm/impl/PortStatusListener_T.cpp:
+        * connectors/dds4ccm/impl/PublisherListener_T.cpp:
+        * connectors/dds4ccm/impl/SubscriberListener_T.cpp:
+        * connectors/dds4ccm/impl/TopicListener_T.cpp:
+          Log the dds status masks with %x and added the logging to some more
+          methods
+
 Tue Aug  3 18:24:17 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/Config_Handlers/XML_File_Intf.cpp:
diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp
index 6507851b3c2..24c2880915c 100644
--- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp
+++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.cpp
@@ -4,10 +4,6 @@
 #include "ami4ccm/ami4ccm.h"
 #include "tao/debug.h"
 
-ACE_RCSID (ami4ccm,
-           ami4ccm,
-           "$Id$")
-
 CCM_AMI::ExceptionHolder_i::ExceptionHolder_i (
   ::Messaging::ExceptionHolder* holder)
     : holder_ (holder)
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
index fb9a9738ac4..3a72594bff2 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
@@ -168,14 +168,17 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_mask (
   DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::get_mask");
 
   ::DDS::StatusMask mask = ::DDS::DATA_AVAILABLE_STATUS;
+  
   if (! ::CORBA::is_nil (listener) ||
       CIAO_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
     {
       mask |= PortStatusListener_type::get_mask (listener);
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, CLINFO
-                    "DataReaderListener_T::get_mask - "
-                    "Mask becomes %d\n",
-                    mask));
     }
+    
+  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, CLINFO
+                 "DataReaderListener_T::get_mask - "
+                 "Mask becomes %x\n",
+                 mask));
+                 
   return mask;
 }
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
index e34a3e0cd1a..df1a32cdf5c 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
@@ -240,16 +240,21 @@ template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE>
 CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_mask (
   typename CCM_TYPE::statelistener_type::_ptr_type listener)
 {
+  ::DDS::StatusMask mask = 0;
+
   if (! ::CORBA::is_nil (listener) ||
       CIAO_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
     {
-      return ::DDS::DATA_AVAILABLE_STATUS |
+      mask = ::DDS::DATA_AVAILABLE_STATUS |
              ::DDS::REQUESTED_DEADLINE_MISSED_STATUS |
              ::DDS::SAMPLE_LOST_STATUS;
     }
-  else
-    {
-      return 0;
-    }
+
+  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, CLINFO
+                 "DataReaderStateListener_T::get_mask - "
+                 "Mask becomes %x\n",
+                 mask));
+
+  return mask;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/PortStatusListener_T.cpp b/CIAO/connectors/dds4ccm/impl/PortStatusListener_T.cpp
index f8580c0becf..46c30ec99d6 100644
--- a/CIAO/connectors/dds4ccm/impl/PortStatusListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/PortStatusListener_T.cpp
@@ -173,19 +173,18 @@ CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_mask (
 {
   DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::get_mask");
 
+  ::DDS::StatusMask mask = 0;
   if (! ::CORBA::is_nil (psl) ||
       CIAO_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
     {
-      DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, CLINFO
-                    "PortStatusListener_T::get_mask - "
-                    "Mask becomes %d\n",
-                    DDS_REQUESTED_DEADLINE_MISSED_STATUS |
-                    DDS_SAMPLE_LOST_STATUS));
-      return DDS_REQUESTED_DEADLINE_MISSED_STATUS |
+      mask = DDS_REQUESTED_DEADLINE_MISSED_STATUS |
              DDS_SAMPLE_LOST_STATUS;
     }
-  else
-    {
-      return 0;
-    }
+
+  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, CLINFO
+                 "PortStatusListener_T::get_mask - "
+                 "Mask becomes %x\n",
+                 mask));
+
+  return mask;                    
 }
diff --git a/CIAO/connectors/dds4ccm/impl/PublisherListener_T.cpp b/CIAO/connectors/dds4ccm/impl/PublisherListener_T.cpp
index 1e6833d1934..d7cc2f54ac6 100644
--- a/CIAO/connectors/dds4ccm/impl/PublisherListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/PublisherListener_T.cpp
@@ -282,10 +282,12 @@ template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE>
 CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_mask (
   ::CCM_DDS::ConnectorStatusListener_ptr error_listener)
 {
-  if (! ::CORBA::is_nil (error_listener) ||
+  ::DDS::StatusMask mask = 0;
+
+   if (! ::CORBA::is_nil (error_listener) ||
       CIAO_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
     {
-      return ::DDS::OFFERED_DEADLINE_MISSED_STATUS |
+      mask = ::DDS::OFFERED_DEADLINE_MISSED_STATUS |
              ::DDS::OFFERED_INCOMPATIBLE_QOS_STATUS |
 #if (CIAO_DDS4CCM_NDDS==1)
              ::DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS |
@@ -294,9 +296,11 @@ CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_mask (
              ::DDS::LIVELINESS_LOST_STATUS |
              ::DDS::PUBLICATION_MATCHED_STATUS;
     }
-  else
-    {
-      return 0;
-    }
+
+  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, CLINFO
+                 "PublisherListener_T::get_mask - "
+                 "Mask becomes %x\n",
+                 mask));
+  return mask;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/SubscriberListener_T.cpp b/CIAO/connectors/dds4ccm/impl/SubscriberListener_T.cpp
index 66891253dc5..fb0a358d6c0 100644
--- a/CIAO/connectors/dds4ccm/impl/SubscriberListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/SubscriberListener_T.cpp
@@ -263,17 +263,22 @@ template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE>
 CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_mask (
   ::CCM_DDS::ConnectorStatusListener_ptr csl)
 {
+  ::DDS::StatusMask mask = 0;
+
   if (! ::CORBA::is_nil (csl) ||
       CIAO_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
     {
-      return ::DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS |
+      mask = ::DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS |
              ::DDS::SAMPLE_REJECTED_STATUS |
              ::DDS::LIVELINESS_CHANGED_STATUS |
              ::DDS::SUBSCRIPTION_MATCHED_STATUS;
     }
-  else
-    {
-      return 0;
-    }
+
+  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, CLINFO
+                 "SubscriberListener_T::get_mask - "
+                 "Mask becomes %x\n",
+                 mask));
+
+  return mask;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/TopicListener_T.cpp b/CIAO/connectors/dds4ccm/impl/TopicListener_T.cpp
index d404422f90c..7aaa82fe360 100644
--- a/CIAO/connectors/dds4ccm/impl/TopicListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/TopicListener_T.cpp
@@ -66,14 +66,18 @@ CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::get_mask (
 {
   DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::get_mask");
 
+  ::DDS::StatusMask mask = 0;
+
   if (! ::CORBA::is_nil (error_listener) ||
       CIAO_debug_level >= DDS4CCM_LOG_LEVEL_DDS_STATUS)
     {
-      return ::DDS::INCONSISTENT_TOPIC_STATUS;
-    }
-  else
-    {
-      return 0;
+      mask = ::DDS::INCONSISTENT_TOPIC_STATUS;
     }
+
+  DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_DDS_STATUS, (LM_DEBUG, CLINFO
+                 "TopicListener_T::get_mask - "
+                 "Mask becomes %x\n",
+                 mask));
+  return mask;
 }