Thu Jun 17 08:43:11 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h:
        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp:
        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp:
        * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h:
        * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp:
        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h:
        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp:
          Cleanup and some simplifications

8 files changed, 83 insertions, 214 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index fca3d5982ac..1b095b2dd98 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Thu Jun 17 08:43:11 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h:
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp:
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp:
+        * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h:
+        * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp:
+        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h:
+        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp:
+          Cleanup and some simplifications
+
 Thu Jun 17 08:33:14 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp:
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
index 47a7abf574d..47e30e03cd5 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
@@ -40,12 +40,14 @@ namespace CIAO_Hello_Receiver_Impl
     ++this->received_;
     ACE_CString rec (an_instance.hello.in ());
     ACE_Date_Time now;
-    int sec_rec = ACE_OS::atoi (rec.substr (0, 2).c_str() );
+    int const sec_rec = ACE_OS::atoi (rec.substr (0, 2).c_str() );
     if (sec_rec > 0)
       {
         int usec_rec = ACE_OS::atoi (rec.substr (3, 6).c_str ());
         if (sec_rec != now.second ())
-          usec_rec += 10000000;
+          {
+            usec_rec += 10000000;
+          }
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<%C> received <%C> - <%d>. difference <%d>\n"),
                     this->name_.c_str (),
                     an_instance.hello.in (),
@@ -59,12 +61,6 @@ namespace CIAO_Hello_Receiver_Impl
       an_instance.hello.in (),
       an_instance.iterator));
     }
-/*
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("DDSHello_Listener: ")
-            ACE_TEXT ("received hello for <%C> - iterator <%d>\n"),
-            an_instance.hello.in (),
-            an_instance.iterator));
-*/
   }
   //============================================================
   // Facet Executor Implementation Class: PortStatusListener_exec_i
@@ -234,8 +230,7 @@ namespace CIAO_Hello_Receiver_Impl
   Receiver_exec_i::set_session_context (
     ::Components::SessionContext_ptr ctx)
   {
-    this->context_ =
-      ::Hello::CCM_Receiver_Context::_narrow (ctx);
+    this->context_ = ::Hello::CCM_Receiver_Context::_narrow (ctx);
     if ( ::CORBA::is_nil (this->context_.in ()))
       {
         throw ::CORBA::INTERNAL ();
@@ -251,11 +246,13 @@ namespace CIAO_Hello_Receiver_Impl
   Receiver_exec_i::ccm_activate (void)
   {
     ::CCM_DDS::DataListenerControl_var lc =
-    this->context_->get_connection_info_out_data_control ();
+      this->context_->get_connection_info_out_data_control ();
 
     if (::CORBA::is_nil (lc.in ()))
       {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
+        ACE_ERROR ((LM_INFO,
+                    ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
+                    
         throw CORBA::INTERNAL ();
       }
     lc->mode ( ::CCM_DDS::ONE_BY_ONE);
@@ -269,7 +266,8 @@ namespace CIAO_Hello_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    ACE_DEBUG ((LM_INFO, "Receiver_exec_i summary: received <%u> - expected <%d> - lost <%u>\n",
+    ACE_DEBUG ((LM_INFO,
+                "Receiver_exec_i summary: received <%u> - expected <%d> - lost <%u>\n",
                 this->received_.value (),
                 this->expected_,
                 this->lost_.value ()));
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
index 2e7bb44dd59..da33fa9b3cc 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
@@ -25,7 +25,7 @@ namespace CIAO_Hello_Receiver_Impl
   {
   public:
     DDSHello_Listener_exec_i (Atomic_ULong &,
-                                  const ACE_CString &);
+                              const ACE_CString &);
     virtual ~DDSHello_Listener_exec_i (void);
 
     virtual void
@@ -80,7 +80,7 @@ namespace CIAO_Hello_Receiver_Impl
     virtual ~ConnectorStatusListener_exec_i (void);
 
     virtual
-      void on_inconsistent_topic( ::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic,
                                     const DDS::InconsistentTopicStatus & status);
     virtual
     void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
@@ -125,15 +125,14 @@ namespace CIAO_Hello_Receiver_Impl
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
     get_info_out_status (void);
+    
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
     get_info_out_connector_status (void);
 
-
     // Operations from Components::SessionComponent.
 
     virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
+    set_session_context (::Components::SessionContext_ptr ctx);
 
     virtual void configuration_complete (void);
 
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
index f9f2df4fa71..0402fa177f0 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
@@ -53,7 +53,7 @@ namespace CIAO_Hello_Sender_Impl
       {
         // be aware that when only the sender runs, ready_to_start will never
         // be true.
-        this->ready_to_start_ = status_kind == DDS::PUBLICATION_MATCHED_STATUS;
+        this->ready_to_start_ = (status_kind == DDS::PUBLICATION_MATCHED_STATUS);
       }
   }
 
@@ -106,7 +106,8 @@ namespace CIAO_Hello_Sender_Impl
     return new ConnectorStatusListener_exec_i (this->ready_to_start_);
   }
 
-  ACE_CString Sender_exec_i::create_message (const ACE_CString &msg)
+  ACE_CString
+  Sender_exec_i::create_message (const ACE_CString &msg)
   {
     if (!this->log_time_)
       return msg;
@@ -140,6 +141,7 @@ namespace CIAO_Hello_Sender_Impl
                                   "Written sample: <%C> - <%u>\n",
                                   msg.c_str (),
                                   new_msg->iterator));
+            delete new_msg;
           }
         else
           { //we're done
@@ -152,7 +154,7 @@ namespace CIAO_Hello_Sender_Impl
   Sender_exec_i::start (void)
   {
     // calculate the interval time
-    long usec = 1000000 / this->rate_;
+    long const usec = 1000000 / this->rate_;
     if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
                 this->ticker_,
                 0,
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
index 39c4787ac52..1481272ef83 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.cpp
@@ -10,48 +10,30 @@
 
 namespace CIAO_Quoter_Broker_Impl
 {
-
-  read_action_Generator::read_action_Generator (Broker_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &,
-                                         const void *)
-  {
-    // Notify the subscribers
-    //    this->pulse_callback_.read_one();
-    //    this->pulse_callback_.read_one_history();
-    //    this->pulse_callback_.read_all();
-    //    this->pulse_callback_.read_all_history();
-    return 0;
-  }
-
   void
   Broker_exec_i::read_one (void)
   {
     ACE_DEBUG ((LM_DEBUG, "read_one\n"));
+
     ::Quoter::Stock_Info  stock_info;
     stock_info.symbol= "IBM";
     ::CCM_DDS::ReadInfo readinfo;
 
     try
       {
-        this->reader_->read_one_last (stock_info, readinfo, ::DDS::HANDLE_NIL);
-        time_t tim = readinfo.source_timestamp.sec;
-        ACE_DEBUG ((LM_DEBUG, "Read_Info. -> date = %C\n", ctime (&tim)));
+        ::Quoter::Reader_var reader =
+          this->context_->get_connection_info_out_data();
+
+        reader->read_one_last (stock_info, readinfo, ::DDS::HANDLE_NIL);
+        time_t const tim = readinfo.source_timestamp.sec;
+        ACE_DEBUG ((LM_DEBUG, "Read_Info. -> date = %C\n", ACE_OS::ctime (&tim)));
         ACE_DEBUG ((LM_DEBUG, "Stock_Info_Read_One: received a stock_info for <%C> at %u:%u:%u\n",
             stock_info.symbol.in (),
             stock_info.low,
             stock_info.current,
             stock_info.high));
       }
-    catch(CCM_DDS::NonExistent& )
+    catch (const CCM_DDS::NonExistent& )
       {
         ACE_DEBUG ((LM_DEBUG, "Stock_Info_Read_One: no stock_info received\n"));
       }
@@ -62,22 +44,28 @@ namespace CIAO_Quoter_Broker_Impl
   {
     ACE_DEBUG ((LM_DEBUG, "read_all\n"));
 
+    ::Quoter::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
     ::Quoter::Stock_InfoSeq stock_infos;
     ::CCM_DDS::ReadInfoSeq readinfoseq;
-    this->reader_->read_all(stock_infos, readinfoseq);
+    reader->read_all(stock_infos, readinfoseq);
     if(readinfoseq.length()!= 0)
       {
         for(CORBA::ULong i = 0; i < readinfoseq.length(); i ++)
           {
-            time_t tim = readinfoseq[i].source_timestamp.sec;
-            ACE_DEBUG ((LM_DEBUG, "Read_Info.source_timestamp -> date = %C\n",ACE_OS::ctime (&tim)));
+            time_t const tim = readinfoseq[i].source_timestamp.sec;
+            ACE_DEBUG ((LM_DEBUG,
+                        "Read_Info.source_timestamp -> date = %C\n",
+                        ACE_OS::ctime (&tim)));
           }
       }
     if(stock_infos.length()!= 0)
       {
         for(CORBA::ULong i = 0; i < stock_infos.length(); i ++)
           {
-            ACE_DEBUG ((LM_DEBUG, "Stock_Info_Read_All: Number %d : received a stock_info for <%C> at %u:%u:%u\n",
+            ACE_DEBUG ((LM_DEBUG,
+                        "Stock_Info_Read_All: Number %d : received a stock_info for <%C> at %u:%u:%u\n",
                 i,
                 stock_infos[i].symbol.in (),
                 stock_infos[i].low,
@@ -91,20 +79,25 @@ namespace CIAO_Quoter_Broker_Impl
   {
     ACE_DEBUG ((LM_DEBUG, "read_all_history\n"));
 
+    ::Quoter::Reader_var reader =
+      this->context_->get_connection_info_out_data();
+
     ::Quoter::Stock_InfoSeq stock_infos;
     ::CCM_DDS::ReadInfoSeq readinfoseq;
-    this->reader_->read_all(stock_infos, readinfoseq);
-    if(readinfoseq.length()!= 0)
+    reader->read_all(stock_infos, readinfoseq);
+    if (readinfoseq.length()!= 0)
       {
-        for(CORBA::ULong i = 0; i < readinfoseq.length(); i ++)
+        for (CORBA::ULong i = 0; i < readinfoseq.length(); i ++)
           {
-            time_t tim = readinfoseq[i].source_timestamp.sec;
-            ACE_DEBUG ((LM_DEBUG, "Read_Info.source_timestamp -> date = %C\n", ACE_OS::ctime (&tim)));
+            time_t const tim = readinfoseq[i].source_timestamp.sec;
+            ACE_DEBUG ((LM_DEBUG,
+                        "Read_Info.source_timestamp -> date = %C\n",
+                        ACE_OS::ctime (&tim)));
           }
       }
-    if(stock_infos.length()!= 0)
+    if (stock_infos.length() != 0)
       {
-        for(CORBA::ULong i = 0; i < stock_infos.length(); i ++)
+        for (CORBA::ULong i = 0; i < stock_infos.length(); i ++)
           {
             ACE_DEBUG ((LM_DEBUG, "Stock_Info_Read_All_History: Number %d : received a stock_info for <%C> at %u:%u:%u\n",
                 i,
@@ -127,20 +120,26 @@ namespace CIAO_Quoter_Broker_Impl
     ::CCM_DDS::ReadInfoSeq readinfoseq;
     try
       {
-        this->reader_->read_one_all(stock_info,stock_infos, readinfoseq, ::DDS::HANDLE_NIL);
-        if(readinfoseq.length()!= 0)
+        ::Quoter::Reader_var reader =
+          this->context_->get_connection_info_out_data();
+
+        reader->read_one_all(stock_info,stock_infos, readinfoseq, ::DDS::HANDLE_NIL);
+        if (readinfoseq.length()!= 0)
           {
-            for(CORBA::ULong i = 0; i < readinfoseq.length(); i ++)
+            for (CORBA::ULong i = 0; i < readinfoseq.length(); i ++)
               {
-                time_t tim = readinfoseq[i].source_timestamp.sec;
-                ACE_DEBUG ((LM_DEBUG, "Read_Info.source_timestamp -> date = %C\n", ctime (&tim)));
+                time_t const tim = readinfoseq[i].source_timestamp.sec;
+                ACE_DEBUG ((LM_DEBUG,
+                            "Read_Info.source_timestamp -> date = %C\n",
+                            ACE_OS::ctime (&tim)));
               }
           }
         if(stock_infos.length()!= 0)
           {
-            for(CORBA::ULong i = 0; i < stock_infos.length(); i ++)
+            for (CORBA::ULong i = 0; i < stock_infos.length(); i ++)
               {
-                ACE_DEBUG ((LM_DEBUG, "Stock_Info_Read_One_History: Number %d : received a stock_info for <%C> at %u:%u:%u\n",
+                ACE_DEBUG ((LM_DEBUG,
+                            "Stock_Info_Read_One_History: Number %d : received a stock_info for <%C> at %u:%u:%u\n",
                     i,
                     stock_infos[i].symbol.in (),
                     stock_infos[i].low,
@@ -149,7 +148,7 @@ namespace CIAO_Quoter_Broker_Impl
               }
           }
       }
-    catch(CCM_DDS::NonExistent& )
+    catch (const CCM_DDS::NonExistent& )
       {
          ACE_DEBUG ((LM_DEBUG, "Stock_Info_Read_One_History: no stock_info's received\n"));
       }
@@ -224,7 +223,6 @@ namespace CIAO_Quoter_Broker_Impl
   Broker_exec_i::Broker_exec_i (void)
   {
     ACE_OS::srand (static_cast <u_int> (ACE_OS::time ()));
-    this->ticker_ = new read_action_Generator (*this);
   }
 
   Broker_exec_i::~Broker_exec_i (void)
@@ -273,30 +271,18 @@ namespace CIAO_Quoter_Broker_Impl
   Broker_exec_i::configuration_complete (void)
   {
     ACE_DEBUG ((LM_DEBUG, ">>> Broker_exec_i::configuration_complete\n"));
-    this->reader_ = this->context_->get_connection_info_out_data();
   }
 
   void
   Broker_exec_i::start (void)
   {
     ACE_DEBUG ((LM_DEBUG, ">>> Broker_exec_i::start\n"));
-    // calculate the interval time
-    if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (0, 2000),
-                ACE_Time_Value (0, 2000)) == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG, ">>> Broker_exec_i::start : error scheduling timer\n"));
-    }
   }
 
   void
   Broker_exec_i::stop (void)
   {
-    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
     ACE_DEBUG ((LM_DEBUG, ">>> Broker_exec_i::stop\n"));
-    delete this->ticker_;
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h
index bc953aa7923..5f34607cb78 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h
@@ -20,27 +20,6 @@ namespace CIAO_Quoter_Broker_Impl
 {
 
   class Broker_exec_i;
-  /**
-  * @class reader activity generator
-  *
-  * @brief an active object used by StockBroker to perform a periodical read action
-  *
-  */
-  class read_action_Generator : public ACE_Event_Handler
-  {
-  public:
-    read_action_Generator (Broker_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    /// Handle the timeout.
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-
-  private:
-    /// Maintains a handle that actually process the event
-    Broker_exec_i &pulse_callback_;
-  };
 
   class BROKER_EXEC_Export Stock_Info_Listener_exec_i
     : public virtual ::Quoter::CCM_Listener,
@@ -104,10 +83,7 @@ namespace CIAO_Quoter_Broker_Impl
     void read_all(void);
     void read_all_history(void);
 
-    // Operations from Components::SessionComponent.
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
+    virtual void set_session_context (::Components::SessionContext_ptr ctx);
 
     virtual void configuration_complete (void);
 
@@ -119,9 +95,6 @@ namespace CIAO_Quoter_Broker_Impl
 
   private:
     ::Quoter::CCM_Broker_Context_var context_;
-    read_action_Generator * ticker_;
-    ::Quoter::Reader_var reader_;
-    ::Quoter::Getter_var getter_;
   };
 
   extern "C" BROKER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp
index f000d418609..3dd5993bbc6 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.cpp
@@ -41,67 +41,6 @@ namespace CIAO_Quoter_Distributor_Impl
     return 0;
   }
 
-
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-     ::DDS::Topic_ptr /*the_topic*/,
-     const DDS::InconsistentTopicStatus & /*status*/)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_inconsistent_topic\n"));
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
-    ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_requested_incompatible_qos\n"));
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected(
-     ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::SampleRejectedStatus & /*status*/)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_sample_rejected\n"));
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-     ::DDS::DataWriter_ptr /*the_writer*/,
-     const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_offered_deadline_missed\n"));
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-     ::DDS::DataWriter_ptr /*the_writer*/,
-     const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_offered_incompatible_qos\n"));
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind status_kind)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("ConnectorStatusListener_exec_i::on_unexpected_status: %d\n"),
-                status_kind));
-  }
-
-  void ConnectorStatusListener_exec_i::on_publication_matched ( ::DDS::DataWriter_ptr ,
-                                      const DDS::PublicationMatchedStatus &)
-  {
-    ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_publication_matched\n"));
-  }
-
   Distributor_exec_i::Distributor_exec_i (void)
     : rate_ (1)
   {
@@ -126,7 +65,7 @@ namespace CIAO_Quoter_Distributor_Impl
       {
         if (ACE_OS::rand () % 2)
           {
-            int delta = (ACE_OS::rand () % 10) - 2;
+            int const delta = (ACE_OS::rand () % 10) - 2;
 
             i->second->current += delta;
 
@@ -136,7 +75,10 @@ namespace CIAO_Quoter_Distributor_Impl
             if (i->second->current < i->second->low)
               i->second->low = i->second->current;
 
-            if (! ::CORBA::is_nil (this->writer_)) {
+            ::Quoter::Writer_var writer =
+              this->context_->get_connection_info_in_data ();
+
+            if (! ::CORBA::is_nil (writer.in ())) {
               ACE_DEBUG ((LM_DEBUG, "WRITE AND CREATE stock_info for <%C> %u:%u:%u\n",
                             i->first.c_str (),
                             i->second->low,
@@ -144,7 +86,7 @@ namespace CIAO_Quoter_Distributor_Impl
                             i->second->high));
               try
                 {
-                  this->writer_->write_one (i->second, ::DDS::HANDLE_NIL);
+                  writer->write_one (i->second, ::DDS::HANDLE_NIL);
                 }
               catch (const CCM_DDS::InternalError& )
                 {
@@ -244,7 +186,7 @@ namespace CIAO_Quoter_Distributor_Impl
   Distributor_exec_i::get_info_out_connector_status (void)
   {
     ACE_DEBUG ((LM_DEBUG, "*************** DIST out connector status************************\n"));
-    return new ConnectorStatusListener_exec_i ();
+    return ::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
   }
 
   void
@@ -265,7 +207,6 @@ namespace CIAO_Quoter_Distributor_Impl
   void
   Distributor_exec_i::configuration_complete (void)
   {
-    this->writer_  = this->context_->get_connection_info_in_data ();
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h
index f53f9bc042e..233f30523b9 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h
@@ -46,46 +46,6 @@ namespace CIAO_Quoter_Distributor_Impl
     Distributor_exec_i &pulse_callback_;
   };
 
-class DISTRIBUTOR_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (void);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-      void on_inconsistent_topic( ::DDS::Topic_ptr the_topic,
-                                  const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
-                                      const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected(
-      ::DDS::DataReader_ptr the_reader,
-      const DDS::SampleRejectedStatus & status);
-
-      virtual
-      void on_offered_deadline_missed(
-        ::DDS::DataWriter_ptr the_writer,
-        const DDS::OfferedDeadlineMissedStatus & status);
-        
-    virtual
-    void on_offered_incompatible_qos(
-      ::DDS::DataWriter_ptr the_writer,
-      const DDS::OfferedIncompatibleQosStatus & status);
-      
-    virtual
-    void on_unexpected_status(
-      ::DDS::Entity_ptr the_entity,
-      ::DDS::StatusKind  status_kind);
-      
-    virtual
-    void on_publication_matched (
-      ::DDS::DataWriter_ptr the_writer,
-      const DDS::PublicationMatchedStatus & status);
-  };
-  
   class DISTRIBUTOR_EXEC_Export Distributor_exec_i
     : public virtual Distributor_Exec,
       public virtual ::CORBA::LocalObject
@@ -128,7 +88,6 @@ class DISTRIBUTOR_EXEC_Export ConnectorStatusListener_exec_i
     typedef std::map<ACE_CString, Quoter::Stock_Info_var> Stock_Table;
     Stock_Table stocks_;
     CORBA::ULong rate_;
-    ::Quoter::Writer_var writer_;
   };
 
   extern "C" DISTRIBUTOR_EXEC_Export ::Components::EnterpriseComponent_ptr