Wed Feb 24 11:39:52 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/impl/ndds/DataWriter.cpp
        * connectors/dds4ccm/impl/ndds/DataWriter.h
        * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
        * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp
        * connectors/dds4ccm/impl/ndds/DDS_Write_T.h
        * connectors/dds4ccm/impl/ndds/Publisher.cpp
        * connectors/dds4ccm/impl/ndds/PublisherListener.cpp
        * connectors/dds4ccm/impl/ndds/TopicDescription.h
          More cleanup

9 files changed, 92 insertions, 70 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 777d5ebe439..6710a77a51a 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Wed Feb 24 11:39:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/DataWriter.cpp
+        * connectors/dds4ccm/impl/ndds/DataWriter.h
+        * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
+        * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp
+        * connectors/dds4ccm/impl/ndds/DDS_Write_T.h
+        * connectors/dds4ccm/impl/ndds/Publisher.cpp
+        * connectors/dds4ccm/impl/ndds/PublisherListener.cpp
+        * connectors/dds4ccm/impl/ndds/TopicDescription.h
+          More cleanup
+
 Wed Feb 24 11:26:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp
index a29bbbe6930..4f0b6fdf0bb 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp
@@ -9,7 +9,8 @@
 #include "dds4ccm/impl/logger/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-DDS_Write_T<DDS_TYPE, CCM_TYPE>::DDS_Write_T (void)
+DDS_Write_T<DDS_TYPE, CCM_TYPE>::DDS_Write_T (void) :
+  ccm_dds_writer_i (0)
 {
 }
 
@@ -53,7 +54,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
             }
           ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i  *rw =
             dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i  *> (dwv_tmp.in ());
-          this->rti_writer_.set_impl (rw->get_impl ());
+          this->ccm_dds_writer_i.set_impl (rw->get_impl ());
           this->data_writer_ = ::DDS::CCM_DataWriter::_narrow (dwv_tmp);
           this->writer_t_.set_impl (dwv_tmp);
         }
@@ -77,7 +78,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE>::activate ()
                             DataWriterListener (),
                             CORBA::NO_MEMORY ());
         }
-      this->rti_writer_.set_listener (
+      this->ccm_dds_writer_i.set_listener (
         this->data_listener_.in (),
         ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::get_mask ());
     }
@@ -95,7 +96,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE>::passivate ()
   DDS4CCM_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::passivate");
   try
     {
-      this->rti_writer_.set_listener (
+      this->ccm_dds_writer_i.set_listener (
         ::DDS::DataWriterListener::_nil (),
         0);
       this->data_listener_ = ::DDS::DataWriterListener::_nil ();
@@ -116,7 +117,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE>::remove (
   try
     {
       publisher->delete_datawriter (this->data_writer_.in ());
-      this->rti_writer_.set_impl (0);
+      this->ccm_dds_writer_i.set_impl (0);
       this->data_writer_ = ::DDS::CCM_DataWriter::_nil ();
       this->writer_t_.set_impl (0);
     }
@@ -143,6 +144,6 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE>::get_dds_entity (void)
 {
   DDS4CCM_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::get_dds_entity");
 
-  return &this->rti_writer_;
+  return &this->ccm_dds_writer_i;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h
index 41581d938f1..d42f824e608 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h
@@ -49,7 +49,7 @@ private:
   ::DDS::CCM_DataWriter_var data_writer_;
   ::DDS::DataWriterListener_var data_listener_;
   ::CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE> writer_t_;
-  ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i rti_writer_;
+  ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i ccm_dds_writer_i;
   //@}
 
   typedef ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE> DataWriterListener;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
index 8bf1cddf5aa..a9e746df4de 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
@@ -19,8 +19,8 @@ namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_DataWriter_i::CCM_DDS_DataWriter_i (void)
-      : impl_ (0)
+    CCM_DDS_DataWriter_i::CCM_DDS_DataWriter_i (DDSDataWriter * dw)
+      : impl_ (dw)
     {
     }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
index 3f731148fc6..996477acc4a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
@@ -36,7 +36,7 @@ namespace CIAO
     {
     public:
       /// Constructor
-      CCM_DDS_DataWriter_i (void);
+      CCM_DDS_DataWriter_i (DDSDataWriter * dw);
 
       /// Destructor
       virtual ~CCM_DDS_DataWriter_i (void);
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
index dcface51af7..041092a4324 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
@@ -25,16 +25,17 @@ namespace CIAO
       ::DDSDataWriter *the_writer,
       const ::DDS_OfferedDeadlineMissedStatus & status)
     {
+      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::OfferedDeadlineMissedStatus ddsstatus;
       ddsstatus <<= status;
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-      ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ());
-      CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ());
-      dw->set_impl (the_writer);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (the_writer));
       this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus);
 #else
-      this->impl_->on_offered_deadline_missed (the_writer, status);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (the_writer));
+      this->impl_->on_offered_deadline_missed (dds_writer.in (), status);
 #endif
     }
 
@@ -43,16 +44,17 @@ namespace CIAO
       ::DDSDataWriter *the_writer,
       const ::DDS_OfferedIncompatibleQosStatus & status)
     {
+      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::OfferedIncompatibleQosStatus ddsstatus;
       ddsstatus <<= status;
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-      ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ());
-      CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ());
-      dw->set_impl (the_writer);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (the_writer));
       this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus);
 #else
-      this->impl_->on_offered_incompatible_qos (the_writer, status);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (the_writer));
+      this->impl_->on_offered_incompatible_qos (dds_writer.in (), status);
 #endif
     }
 
@@ -61,16 +63,17 @@ namespace CIAO
       ::DDSDataWriter *the_writer,
       const ::DDS_LivelinessLostStatus & status)
     {
+      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::LivelinessLostStatus ddsstatus;
       ddsstatus <<= status;
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-      ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ());
-      CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ());
-      dw->set_impl (the_writer);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (the_writer));
       this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus);
 #else
-      this->impl_->on_liveliness_lost (the_writer, status);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (the_writer));
+      this->impl_->on_liveliness_lost (dds_writer.in (), status);
 #endif
     }
 
@@ -79,16 +82,17 @@ namespace CIAO
       ::DDSDataWriter *the_writer,
       const ::DDS_PublicationMatchedStatus & status)
     {
+      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::PublicationMatchedStatus ddsstatus;
       ddsstatus <<= status;
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-      ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ());
-      CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ());
-      dw->set_impl (the_writer);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (the_writer));
       this->impl_->on_publication_matched (dds_writer.in (), ddsstatus);
 #else
-      this->impl_->on_publication_matched (the_writer, status);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (the_writer));
+      this->impl_->on_publication_matched (dds_writer.in (), status);
 #endif
     }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
index 7156450762d..aa5274fb602 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
@@ -50,11 +50,6 @@ namespace CIAO
           throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
         }
 
-      ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DataWriter_i (),
-                        CORBA::NO_MEMORY ());
-
       DDSDataWriterListener *rti_drl = 0;
       if (!CORBA::is_nil (a_listener))
         {
@@ -77,6 +72,11 @@ namespace CIAO
           throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
         }
 
+      ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil ();
+      ACE_NEW_THROW_EX (retval,
+                        CCM_DDS_DataWriter_i (rti_dw),
+                        CORBA::NO_MEMORY ());
+
       rti_dw->enable ();
       CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ());
       dw->set_impl (rti_dw);
@@ -110,11 +110,6 @@ namespace CIAO
           throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
         }
 
-      ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DataWriter_i (),
-                        CORBA::NO_MEMORY ());
-
       DDSDataWriterListener *rti_drl = 0;
       if (!CORBA::is_nil (a_listener))
         {
@@ -137,6 +132,11 @@ namespace CIAO
           throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
         }
 
+      ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil ();
+      ACE_NEW_THROW_EX (retval,
+                        CCM_DDS_DataWriter_i (rti_dw),
+                        CORBA::NO_MEMORY ());
+
       rti_dw->enable ();
       CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ());
       dw->set_impl (rti_dw);
@@ -183,18 +183,19 @@ namespace CIAO
     ::DDS::DataWriter_ptr
     CCM_DDS_Publisher_i::lookup_datawriter (const char * impl_name)
     {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil ();
+#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
+      DDSDataWriter* dw = this->impl ()->lookup_datawriter (impl_name);
       ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DataWriter_i (),
+                        CCM_DDS_DataWriter_i (dw),
                         CORBA::NO_MEMORY ());
-      DDSDataWriter* dw = this->impl ()->lookup_datawriter (impl_name);
-      CCM_DDS_DataWriter_i *rti_dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ());
-      rti_dw->set_impl (dw);
-      return retval._retn ();
 #else
-      return this->impl ()->lookup_datawriter (impl_name);
+      ::DDS::DataWriter_var dw = this->impl ()->lookup_datawriter (impl_name);
+      ACE_NEW_THROW_EX (retval,
+                        CCM_DDS_DataWriter_i (dw.in ()),
+                        CORBA::NO_MEMORY ());
 #endif
+      return retval._retn ();
     }
 
     ::DDS::ReturnCode_t
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
index 7413b5c0945..fe61d91b23b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
@@ -33,16 +33,17 @@ namespace CIAO
     {
       DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_offered_deadline_missed");
 
+      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::OfferedDeadlineMissedStatus ddsstatus;
       ddsstatus <<= status;
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-      ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ());
-      CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ());
-      dw->set_impl (writer);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (writer));
       this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus);
 #else
-      this->impl_->on_offered_deadline_missed (writer, status);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (writer));
+      this->impl_->on_offered_deadline_missed (dds_writer.in (), status);
 #endif
     }
 
@@ -53,16 +54,17 @@ namespace CIAO
     {
       DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_offered_incompatible_qos");
 
+      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::OfferedIncompatibleQosStatus ddsstatus;
       ddsstatus <<= status;
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-      ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ());
-      CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ());
-      dw->set_impl (writer);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (writer));
       this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus);
 #else
-      this->impl_->on_offered_incompatible_qos (writer, status);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (writer));
+      this->impl_->on_offered_incompatible_qos (dds_writer.in (), status);
 #endif
     }
 
@@ -73,16 +75,17 @@ namespace CIAO
     {
       DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_liveliness_lost");
 
+      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::LivelinessLostStatus ddsstatus;
       ddsstatus <<= status;
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-      ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ());
-      CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ());
-      dw->set_impl (writer);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (writer));
       this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus);
 #else
-      this->impl_->on_liveliness_lost (writer, status);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (writer));
+      this->impl_->on_liveliness_lost (dds_writer.in (), status);
 #endif
     }
 
@@ -93,16 +96,17 @@ namespace CIAO
     {
       DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_publication_matched");
 
+      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
 #if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
       ::DDS::PublicationMatchedStatus ddsstatus;
       ddsstatus <<= status;
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-      ACE_NEW (dds_writer, CCM_DDS_DataWriter_i ());
-      CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (dds_writer.in ());
-      dw->set_impl (writer);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (writer));
       this->impl_->on_publication_matched (dds_writer.in (), ddsstatus);
 #else
-      this->impl_->on_publication_matched (writer, status);
+      ACE_NEW (dds_writer, 
+               CCM_DDS_DataWriter_i (writer));
+      this->impl_->on_publication_matched (dds_writer.in (), status);
 #endif
     }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
index 2cd87cf0057..e00754ba14e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_RTI_TOPICDESCRIPTION_H
-#define CIAO_RTI_TOPICDESCRIPTION_H
+#ifndef CIAO_DDS4CCM_TOPICDESCRIPTION_H
+#define CIAO_DDS4CCM_TOPICDESCRIPTION_H
 
 #include "tao/LocalObject.h"
 
@@ -60,4 +60,4 @@ namespace CIAO
   }
 }
 
-#endif /* CIAO_RTI_TOPICDESCRIPTION_H */
+#endif /* CIAO_DDS4CCM_TOPICDESCRIPTION_H */