Tue Aug 10 07:00:56 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/DDSDataWriterListener_T.h:
        * connectors/dds4ccm/impl/DDS_Listen_T.cpp:
        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
          Check return values of set_listener

5 files changed, 40 insertions, 6 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 16c5eb34079..8c97a5f414e 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Tue Aug 10 07:00:56 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDSDataWriterListener_T.h:
+        * connectors/dds4ccm/impl/DDS_Listen_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
+          Check return values of set_listener
+
 Mon Aug  9 19:09:26 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/impl/DDSDataWriterListener_T.h b/CIAO/connectors/dds4ccm/impl/DDSDataWriterListener_T.h
index 36be5a188f7..ca6a5bb3581 100644
--- a/CIAO/connectors/dds4ccm/impl/DDSDataWriterListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDSDataWriterListener_T.h
@@ -65,7 +65,6 @@ namespace CIAO
     private:
       ::DDS::DataWriterListener_var impl_;
       DataWriter_type * typed_dw_;
-
     };
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
index 5a76abb1119..cd142833439 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
@@ -61,9 +61,18 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate (
                           this->condition_manager_),
                         ::CORBA::NO_MEMORY ());
     }
-  this->data_reader_.set_listener (
+    
+  ::DDS::ReturnCode_t const retcode = this->data_reader_.set_listener (
     this->listener_.in (),
     DataReaderListener_type::get_mask (status));
+
+  if (retcode != ::DDS::RETCODE_OK)
+    {
+      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+                    "DDS_Listen_T::activate - "
+                    "Error while setting the listener on the listen - <%C>\n",
+                    ::CIAO::DDS4CCM::translate_retcode (retcode)));
+    }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
index 30fd684e1bc..4c33709ff8c 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp
@@ -76,9 +76,18 @@ DDS_Subscriber_Base_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate (
                         PortStatusListener_type (status, reactor),
                         ::CORBA::NO_MEMORY ());
     }
-  this->data_reader_.set_listener (
-    this->listener_.in (),
-    PortStatusListener_type::get_mask (status));
+    
+  ::DDS::ReturnCode_t const retcode = this->data_reader_.set_listener (
+      this->listener_.in (),
+      PortStatusListener_type::get_mask (status));
+
+  if (retcode != ::DDS::RETCODE_OK)
+    {
+      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+                    "DDS_Subscriber_Base_T::activate - "
+                    "Error while setting the listener on the subscriber - <%C>\n",
+                    ::CIAO::DDS4CCM::translate_retcode (retcode)));
+    }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
index 5efa6e56694..cebefb0038c 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp
@@ -77,9 +77,18 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::activate ()
                         DataWriterListener_type (),
                         ::CORBA::NO_MEMORY ());
     }
-  this->ccm_dds_writer_.set_listener (
+
+  ::DDS::ReturnCode_t const retcode = this->ccm_dds_writer_.set_listener (
     this->data_listener_.in (),
     DataWriterListener_type::get_mask ());
+
+  if (retcode != ::DDS::RETCODE_OK)
+    {
+      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+                    "DDS_Update_T::activate - "
+                    "Error while setting the listener on the updater - <%C>\n",
+                    ::CIAO::DDS4CCM::translate_retcode (retcode)));
+    }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE>