3 files changed, 23 insertions, 8 deletions

diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
index 9e7859f7941..9b5dd61b1ff 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
@@ -12,7 +12,7 @@ CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::DataReaderListener
       typename CCM_TYPE::context_type::_ptr_type context,
       ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> &enabled)
       : context_ (CCM_TYPE::context_type::_duplicate (context)),
-        enable_ (enabled)
+        enabled_ (enabled)
 {
   CIAO_TRACE ("CIAO::DDS4CCM::RTI::DataReaderListener_T::DataReaderListener_T");
   this->info_out_portstatus_ = this->context_->get_connection_info_out_status ();
@@ -30,7 +30,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(::DDS::DataReader *rdr)
 {
-  if (!this->enable_.value ())
+  if (!this->enabled_.value ())
     return;
 
   ::CIAO::DDS4CCM::RTI::RTI_DataReader_i* rd =
@@ -38,7 +38,7 @@ CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(
   typename DDS_TYPE::data_reader * reader =
       dynamic_cast< typename DDS_TYPE::data_reader * > ((rd->get_datareader ()));
 
-  if (!reader) 
+  if (!reader)
     {
       /* In this specific case, this will never fail */
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("DataReaderListener_T::narrow failed.\n")));
@@ -75,3 +75,18 @@ CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_requested_incom
 {
   this->info_out_connector_status_->on_requested_incompatible_qos (the_reader, status);
 }
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+bool
+CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::enabled (void) const
+{
+  return this->enabled_;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE>
+void
+CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::enabled (bool enabled)
+{
+  this->enabled_ = enabled;
+}
+
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
index 90cddceba0f..1de80065f47 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
@@ -22,12 +22,12 @@ namespace CIAO
         private ACE_Copy_Disabled
       {
       public:
-        // Constructor
+        /// Constructor
         DataReaderListener_T (
                       typename CCM_TYPE::context_type::_ptr_type context,
                       ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> &enabled);
 
-        // Destructor
+        /// Destructor
         virtual ~DataReaderListener_T (void);
 
         virtual void on_data_available( ::DDS::DataReader *rdr);
@@ -49,7 +49,7 @@ namespace CIAO
 
         CCM_DDS::ConnectorStatusListener_var  info_out_connector_status_;
         CCM_DDS::PortStatusListener_var       info_out_portstatus_;
-        ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> &enable_;
+        ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> &enabled_;
       };
     }
   }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h
index fedb8eb17cd..6c4321dd3f1 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h
@@ -20,12 +20,12 @@ namespace CIAO
       private ACE_Copy_Disabled
     {
     public:
-      // Constructor
+      /// Constructor
       DataWriterListener_T (
                     typename CCM_TYPE::context_type::_ptr_type context,
                     ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> &enabled);
 
-      // Destructor
+      /// Destructor
       virtual ~DataWriterListener_T (void);
 
       virtual void on_offered_deadline_missed (