Sun Aug 8 12:46:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/DDS_Listen_T.cpp:
        * connectors/dds4ccm/impl/DDS_StateListen_T.h:
        * connectors/dds4ccm/impl/DDS_StateListen_T.cpp:
        * connectors/dds4ccm/impl/DataReaderListener_T.h:
        * connectors/dds4ccm/impl/DataReaderListener_T.cpp:
        * connectors/dds4ccm/impl/DataReaderStateListener_T.h:
        * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp:
          Pass the control and conditionmanager by reference to the listeners,
          they are always there and no need to check them for nill

        * etc/ciao_dds4ccm.doxygen:
          Updated links to TAO doxygen documentation

9 files changed, 103 insertions, 114 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 2d891d05c8d..c74b19bb09f 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,18 @@
+Sun Aug  8 12:46:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDS_Listen_T.cpp:
+        * connectors/dds4ccm/impl/DDS_StateListen_T.h:
+        * connectors/dds4ccm/impl/DDS_StateListen_T.cpp:
+        * connectors/dds4ccm/impl/DataReaderListener_T.h:
+        * connectors/dds4ccm/impl/DataReaderListener_T.cpp:
+        * connectors/dds4ccm/impl/DataReaderStateListener_T.h:
+        * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp:
+          Pass the control and conditionmanager by reference to the listeners,
+          they are always there and no need to check them for nill
+
+        * etc/ciao_dds4ccm.doxygen:
+          Updated links to TAO doxygen documentation
+
 Thu Aug  5 15:46:04 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/MPC/config/dance_config_handlers_base.mpb:
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
index 6b660801965..5a76abb1119 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_Listen_T.cpp
@@ -26,6 +26,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete (
 {
   DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete");
 
+  bool result = false;
   if (DDSSubscriberBase_type::configuration_complete (
             component,
             topic,
@@ -34,8 +35,10 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete (
             profile_name))
     {
       this->data_control_._set_component (component);
+      result = true;
     }
-  return false;
+    
+  return result;
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
@@ -53,9 +56,9 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate (
                         DataReaderListener_type (
                           listener,
                           status,
-                          &data_control_,
+                          data_control_,
                           reactor,
-                          &this->condition_manager_),
+                          this->condition_manager_),
                         ::CORBA::NO_MEMORY ());
     }
   this->data_reader_.set_listener (
@@ -81,6 +84,6 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::get_data_control (void)
 {
   DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::get_data_control");
 
-  return &this->data_control_;
+  return ::CCM_DDS::CCM_DataListenerControl::_duplicate (&this->data_control_);
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
index 8014cb4b804..37bfde37dac 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.cpp
@@ -9,9 +9,7 @@
 #include "dds4ccm/impl/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
-DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::DDS_StateListen_T (void) :
-  data_control_ (new CCM_DDS_StateListenerControl_T
-    < ::CCM_DDS::CCM_StateListenerControl, CCM_TYPE> ())
+DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::DDS_StateListen_T (void) 
 {
 }
 
@@ -31,6 +29,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complet
 {
   DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complete");
 
+  bool result = false;
   if (DDSSubscriberBase_type::configuration_complete (
             component,
             topic,
@@ -38,22 +37,11 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::configuration_complet
             library_name,
             profile_name))
     {
-      StateListenerControl_type *dds_slc = dynamic_cast < StateListenerControl_type * >
-        (this->data_control_.in ());
-      if (dds_slc)
-        {
-          dds_slc->_set_component (component);
-          return true;
-        }
-      else
-        {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                        ACE_TEXT ("DDS_StateListen_T::configuration_complete - ")
-                        ACE_TEXT ("Unable to cast Data control.\n")));
-          return false;
-        }
+      this->data_control_._set_component (component);
+      result = true;
     }
-  return false;
+    
+  return result;
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, DDS4CCM_Vendor VENDOR_TYPE>
@@ -71,15 +59,15 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::activate (
                         DataReaderStateListener_type (
                           listener,
                           status,
-                          this->data_control_.in (),
+                          this->data_control_,
                           reactor,
-                          &this->condition_manager_),
+                          this->condition_manager_),
                         ::CORBA::NO_MEMORY ());
     }
   ::DDS::ReturnCode_t const retcode = this->data_reader_.set_listener (
                               this->listener_.in (),
                               DataReaderStateListener_type::get_mask (listener));
-  if (retcode != DDS::RETCODE_OK)
+  if (retcode != ::DDS::RETCODE_OK)
     {
       DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
                     "DDS_StateListen_T::activate - "
@@ -95,18 +83,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::remove (
 {
   DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::remove");
 
-  StateListenerControl_type *dds_slc = dynamic_cast < StateListenerControl_type * >
-    (this->data_control_.in ());
-  if (dds_slc)
-    {
-      dds_slc->_set_component (CCM_TYPE::base_type::_nil ());
-    }
-  else
-    {
-      DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                    ACE_TEXT ("DDS_StateListen_T::remove - ")
-                    ACE_TEXT ("Unable to cast StateListenerControl.\n")));
-    }
+  this->data_control_._set_component (CCM_TYPE::base_type::_nil ());
   DDSSubscriberBase_type::remove (subscriber);
 }
 
@@ -116,8 +93,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::get_data_control (voi
 {
   DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::get_data_control");
 
-  return ::CCM_DDS::CCM_StateListenerControl::_duplicate (
-    this->data_control_.in ());
+  return ::CCM_DDS::CCM_StateListenerControl::_duplicate (&this->data_control_);
 }
 
 
diff --git a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
index feaf32fd318..c8018b391ab 100644
--- a/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DDS_StateListen_T.h
@@ -53,10 +53,10 @@ public:
 
 private:
   /**
-   * DDS_Listen
+   * DDS_StateListen
    */
   //@{
-  ::CCM_DDS::CCM_StateListenerControl_var data_control_;
+  StateListenerControl_type data_control_;
   //@}
 };
 
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
index 3a72594bff2..21918dcbd3c 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.cpp
@@ -8,9 +8,9 @@ template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE>
 CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::DataReaderListener_T (
   typename CCM_TYPE::listener_type::_ptr_type listener,
   ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-  DataListenerControl_type * control,
+  DataListenerControl_type& control,
   ACE_Reactor * reactor,
-  ConditionManager_type * condition_manager)
+  ConditionManager_type& condition_manager)
   : PortStatusListener_T <DDS_TYPE, CCM_TYPE, VENDOR_TYPE> (port_status_listener, reactor) ,
     listener_ (CCM_TYPE::listener_type::_duplicate (listener)),
     control_ (control),
@@ -32,28 +32,26 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_data_av
 {
   DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::on_data_available");
 
-  if ((this->control_ &&
-       this->control_->mode () == ::CCM_DDS::NOT_ENABLED) ||
-      ::CORBA::is_nil (rdr))
+  if (!::CORBA::is_nil (rdr) &&
+      this->control_.mode () != ::CCM_DDS::NOT_ENABLED)
     {
-      return;
-    }
-  if (this->reactor_)
-    {
-      DataReaderHandler_type * rh = 0;
-      ACE_NEW (rh, DataReaderHandler_type (this, rdr));
+      if (this->reactor_)
+        {
+          DataReaderHandler_type * rh = 0;
+          ACE_NEW (rh, DataReaderHandler_type (this, rdr));
 
-      ACE_Event_Handler_var safe_handler (rh);
-      if (this->reactor_->notify (rh) != 0)
+          ACE_Event_Handler_var safe_handler (rh);
+          if (this->reactor_->notify (rh) != 0)
+            {
+              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+                            ACE_TEXT ("DataReaderListener_T::failed to use reactor.\n")));
+            }
+        }
+      else
         {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                        ACE_TEXT ("DataReaderListener_T::failed to use reactor.\n")));
+          this->on_data_available_i (rdr);
         }
     }
-  else
-    {
-      this->on_data_available_i (rdr);
-    }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE>
@@ -63,9 +61,8 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_data_av
 {
   DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::on_data_available_i");
 
-  if ((this->control_ &&
-       this->control_->mode () == ::CCM_DDS::NOT_ENABLED) ||
-      ::CORBA::is_nil (rdr))
+  if (::CORBA::is_nil (rdr) ||
+      this->control_.mode () == ::CCM_DDS::NOT_ENABLED)
     {
       return;
     }
@@ -88,13 +85,13 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_data_av
       reader->take (data,
                     sample_info,
                     DDS_LENGTH_UNLIMITED,
-                    this->condition_manager_->get_querycondition_listener ());
+                    this->condition_manager_.get_querycondition_listener ());
 
-  if (result == DDS_RETCODE_NO_DATA)
+  if (result == ::DDS::RETCODE_NO_DATA)
     {
       return;
     }
-  else if (result != DDS_RETCODE_OK)
+  else if (result != ::DDS::RETCODE_OK)
     {
       DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
                           ACE_TEXT ("Unable to take data from data reader, ")
@@ -103,7 +100,7 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_data_av
       return;
     }
 
-  if (this->control_->mode () == ::CCM_DDS::ONE_BY_ONE)
+  if (this->control_.mode () == ::CCM_DDS::ONE_BY_ONE)
     {
       for (::DDS_Long i = 0; i < data.length (); ++i)
         {
@@ -150,8 +147,8 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_data_av
     }
 
   // Return the loan
-  DDS_ReturnCode_t const retval = reader->return_loan (data, sample_info);
-  if (retval != DDS_RETCODE_OK)
+  DDS::ReturnCode_t const retval = reader->return_loan (data, sample_info);
+  if (retval != ::DDS::RETCODE_OK)
     {
       DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
         "CIAO::DDS4CCM::DataReaderListener_T::on_data_available_i - "
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h
index 7a5e74864dd..ac62eb722ae 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderListener_T.h
@@ -41,9 +41,9 @@ namespace CIAO
       DataReaderListener_T (
         typename CCM_TYPE::listener_type::_ptr_type listener,
         ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-        DataListenerControl_type * control,
+        DataListenerControl_type& control,
         ACE_Reactor * reactor,
-        ConditionManager_type * condition_manager);
+        ConditionManager_type& condition_manager);
 
       /// Destructor
       virtual ~DataReaderListener_T (void);
@@ -57,8 +57,8 @@ namespace CIAO
 
     private:
       typename CCM_TYPE::listener_type::_var_type listener_;
-      DataListenerControl_type * control_;
-      ConditionManager_type * condition_manager_;
+      DataListenerControl_type& control_;
+      ConditionManager_type& condition_manager_;
     };
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
index df1a32cdf5c..3d3bf2119d1 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp
@@ -11,12 +11,12 @@ template <typename DDS_TYPE, typename CCM_TYPE, DDS4CCM_Vendor VENDOR_TYPE>
 CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::DataReaderStateListener_T (
   typename CCM_TYPE::statelistener_type::_ptr_type listener,
   ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-  ::CCM_DDS::StateListenerControl_ptr control,
+  StateListenerControl_type& control,
   ACE_Reactor* reactor,
-  ConditionManager_type * condition_manager)
+  ConditionManager_type& condition_manager)
   : PortStatusListener_T <DDS_TYPE, CCM_TYPE, VENDOR_TYPE> (port_status_listener, reactor) ,
     listener_ (CCM_TYPE::statelistener_type::_duplicate (listener)),
-    control_ (::CCM_DDS::StateListenerControl::_duplicate (control)),
+    control_ (control),
     condition_manager_ (condition_manager)
 {
   DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::DataReaderStateListener_T");
@@ -35,27 +35,25 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_da
   ::DDS::DataReader_ptr rdr)
 {
   DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available");
-  if (::CORBA::is_nil (this->control_.in ()) ||
-      this->control_->mode () == ::CCM_DDS::NOT_ENABLED ||
-      ::CORBA::is_nil (rdr))
+  if (!::CORBA::is_nil (rdr) &&
+     this->control_.mode () != ::CCM_DDS::NOT_ENABLED)
     {
-      return;
-    }
-  if (this->reactor_)
-    {
-      DataReaderStateHandler_type* rh = 0;
-      ACE_NEW (rh, DataReaderStateHandler_type (this, rdr));
-      ACE_Event_Handler_var safe_handler (rh);
-      if (this->reactor_->notify (rh) != 0)
+      if (this->reactor_)
         {
-          DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
-                        ACE_TEXT ("DataReaderStateHandler_T::")
-                        ACE_TEXT ("failed to use reactor.\n")));
+          DataReaderStateHandler_type* rh = 0;
+          ACE_NEW (rh, DataReaderStateHandler_type (this, rdr));
+          ACE_Event_Handler_var safe_handler (rh);
+          if (this->reactor_->notify (rh) != 0)
+            {
+              DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO
+                            ACE_TEXT ("DataReaderStateHandler_T::")
+                            ACE_TEXT ("failed to use reactor.\n")));
+            }
+        }
+      else
+        {
+          this->on_data_available_i (rdr);
         }
-    }
-  else
-    {
-      this->on_data_available_i (rdr);
     }
 }
 
@@ -66,9 +64,8 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_da
 {
   DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available_i");
 
-  if (::CORBA::is_nil (this->control_.in ()) ||
-      this->control_->mode () == ::CCM_DDS::NOT_ENABLED ||
-      ::CORBA::is_nil (rdr))
+  if (::CORBA::is_nil (rdr) ||
+      this->control_.mode () == ::CCM_DDS::NOT_ENABLED)
     {
       return;
     }
@@ -91,17 +88,17 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_da
       ::DDS_SampleInfoSeq sample_info;
       ::DDS_Long max_samples = 0;
 
-      this->control_->mode () == ::CCM_DDS::ONE_BY_ONE
+      this->control_.mode () == ::CCM_DDS::ONE_BY_ONE
         ? max_samples = DDS_LENGTH_UNLIMITED
-        : this->control_->max_delivered_data() == 0
+        : this->control_.max_delivered_data() == 0
           ? max_samples = DDS_LENGTH_UNLIMITED
-          : max_samples = this->control_->max_delivered_data ();
+          : max_samples = this->control_.max_delivered_data ();
 
       ::DDS::ReturnCode_t const result = reader->take (
                   data,
                   sample_info,
                   max_samples,
-                  this->condition_manager_->get_querycondition_listener ());
+                  this->condition_manager_.get_querycondition_listener ());
       if (result == DDS_RETCODE_NO_DATA)
         {
           return;
@@ -112,7 +109,7 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_da
                         ACE_TEXT ("Unable to take data from data reader, ")
                         ACE_TEXT ("error %d.\n"), result));
         }
-      if (this->control_->mode () == ::CCM_DDS::ONE_BY_ONE)
+      if (this->control_.mode () == ::CCM_DDS::ONE_BY_ONE)
         {
           for (::DDS_Long i = 0; i < data.length (); ++i)
             {
@@ -143,7 +140,7 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>::on_da
                 }
             }
         }
-      else if (this->control_->mode () == ::CCM_DDS::MANY_BY_MANY)
+      else if (this->control_.mode () == ::CCM_DDS::MANY_BY_MANY)
         {
           typedef std::vector<DDS_Long> Updates;
           Updates updates;
diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h
index 4ade557d235..61b5d5b0e26 100644
--- a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.h
@@ -25,15 +25,17 @@ namespace CIAO
       ConditionManager_type;
     typedef ::CIAO::DDS4CCM::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE, VENDOR_TYPE>
       DataReaderStateHandler_type;
+    typedef CCM_DDS_StateListenerControl_T< ::CCM_DDS::CCM_StateListenerControl, CCM_TYPE>
+      StateListenerControl_type;
 
     public:
       /// Constructor
       DataReaderStateListener_T (
                     typename CCM_TYPE::statelistener_type::_ptr_type listener,
                     ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-                    ::CCM_DDS::StateListenerControl_ptr control,
+                    StateListenerControl_type& control,
                     ACE_Reactor* reactor,
-                    ConditionManager_type * condition_manager);
+                    ConditionManager_type& condition_manager);
 
       /// Destructor
       virtual ~DataReaderStateListener_T (void);
@@ -47,8 +49,8 @@ namespace CIAO
 
     private:
       typename CCM_TYPE::statelistener_type::_var_type listener_;
-      ::CCM_DDS::StateListenerControl_var control_;
-      ConditionManager_type * condition_manager_;
+      StateListenerControl_type& control_;
+      ConditionManager_type& condition_manager_;
     };
   }
 }
diff --git a/CIAO/etc/ciao_dds4ccm.doxygen b/CIAO/etc/ciao_dds4ccm.doxygen
index 13d40d34583..eec39cfe6d4 100644
--- a/CIAO/etc/ciao_dds4ccm.doxygen
+++ b/CIAO/etc/ciao_dds4ccm.doxygen
@@ -137,14 +137,13 @@ EXPAND_AS_DEFINED     = ACE_RCSID \
 TAGFILES              = html/ace/ACE.tag=../../ace \
                         html/tao/TAO.tag=../tao \
                         html/ace/ssl/ACE_SSL.tag=../../ace/ssl \
-                        html/tao/portableserver/TAO_PortableServer.tag=../tao/portableserver \
-                        html/tao/iortable/TAO_IORTable.tag=../tao/iortable \
-                        html/tao/rtcorba/TAO_RTCORBA.tag=../tao/rtcorba \
-                        html/tao/security/TAO_Security.tag=../tao/security \
+                        html/tao/portableserver/TAO_PortableServer.tag=....//tao/portableserver \
+                        html/tao/iortable/TAO_IORTable.tag=../../tao/iortable \
+                        html/tao/rtcorba/TAO_RTCORBA.tag=../../tao/rtcorba \
+                        html/tao/security/TAO_Security.tag=../../tao/security \
                         html/acexml/ACEXML.tag=../../acexml \
-                        html/tao/rtportableserver/TAO_RTPortableServer.tag=../tao/rtportableserver \
-                        html/tao/cosnaming/TAO_CosNaming.tag=../tao/cosnaming \
-                        html/tao/ifr/TAO_IFR.tag=../tao/ifr
+                        html/tao/cosnaming/TAO_CosNaming.tag=../../tao/cosnaming \
+                        html/tao/ifr/TAO_IFR.tag=../../tao/ifr
 GENERATE_TAGFILE      = html/ciao/dds4ccm/dds4ccm.tag
 ALLEXTERNALS          = NO
 PERL_PATH             = /usr/bin/perl