Wed Jun 16 12:46:56 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h:
        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h:
        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
        * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h:
        * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h:
        * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp:
          Cleanup, no caching in executors

9 files changed, 45 insertions, 35 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index c205457867f..78a12d089df 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,8 +1,19 @@
+Wed Jun 16 12:46:56 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h:
+        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h:
+        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h:
+        * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h:
+        * connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp:
+          Cleanup, no caching in executors
+
 Wed Jun 16 12:04:34 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/LocalityManager/Scheduler/Deployment_Events.h:
 
-          fuzz. 
+          fuzz.
 
 Wed Jun 16 12:01:10 UTC 2010  Martin Corino  <mcorino@remedy.nl>
 
diff --git a/CIAO/DAnCE/LocalityManager/Daemon/Name_Utilities.cpp b/CIAO/DAnCE/LocalityManager/Daemon/Name_Utilities.cpp
index 258584aeb40..94549fa1162 100644
--- a/CIAO/DAnCE/LocalityManager/Daemon/Name_Utilities.cpp
+++ b/CIAO/DAnCE/LocalityManager/Daemon/Name_Utilities.cpp
@@ -151,8 +151,7 @@ namespace DAnCE
     }
 
     void
-    build_name (const char *name,
-                CosNaming::Name &nm)
+    build_name (const char *name, CosNaming::Name &nm)
     {
       DANCE_TRACE ("Name_Utilities::build_name");
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
index 77b9d43c31e..1c1d6ca38ff 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
@@ -154,15 +154,18 @@ namespace CIAO_CSL_USTest_Sender_Impl
   void
   Sender_exec_i::tick ()
   {
+    ::CSL_US_Connector::Writer_var writer =
+      this->context_->get_connection_test_topic_write_data ();
+
     for (CSL_SRTest_Table::iterator i = this->_ktests_.begin ();
          i != this->_ktests_.end ();
          ++i)
       {
         try
           {
-            if (! ::CORBA::is_nil (this->writer_))
+            if (! ::CORBA::is_nil (writer.in ()))
               {
-                this->writer_->write_one(i->second,::DDS::HANDLE_NIL);
+                writer->write_one(i->second,::DDS::HANDLE_NIL);
                 ACE_DEBUG ((LM_DEBUG, "Written sample: <%C> - <%d>\n",
                   i->first.c_str (),
                   i->second->x));
@@ -204,7 +207,6 @@ namespace CIAO_CSL_USTest_Sender_Impl
   void
   Sender_exec_i::configuration_complete (void)
   {
-    this->writer_  = this->context_->get_connection_test_topic_write_data ();
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h
index 76e011c4f5c..5bbb70e70e6 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h
@@ -110,7 +110,6 @@ namespace CIAO_CSL_USTest_Sender_Impl
 
   private:
     ::CSL_USTest::CCM_Sender_Context_var context_;
-    ::CSL_US_Connector::Writer_var writer_;
 
     Atomic_Boolean publication_matched_received_;
     Atomic_Boolean liveliness_lost_received_;
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
index 3988d462683..c8449e35225 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
@@ -97,14 +97,22 @@ namespace CIAO_Getter_Test_Sender_Impl
   void
   Sender_exec_i::start_timeout_tests (void)
   {
-    this->invoker_->start_timeout_get_one ();
-    this->invoker_->start_timeout_get_many ();
+    GetInvoker_var invoker =
+      this->context_->get_connection_invoke_getter ();
+
+    invoker->start_timeout_get_one ();
+    invoker->start_timeout_get_many ();
   }
 
   void
   Sender_exec_i::write_many (void)
   {
-    GetterTestSeq write_many;
+    ::Getter_Test::GetterTestConnector::Writer_var writer =
+      this->context_->get_connection_info_write_data ();
+    GetInvoker_var invoker =
+      this->context_->get_connection_invoke_getter ();
+    
+    GetterTestSeq write_many (this->keys_ * this->iterations_);
     write_many.length (this->keys_ * this->iterations_);
     for (CORBA::UShort key = 1; key < this->keys_ + 1; ++key)
       {
@@ -120,10 +128,10 @@ namespace CIAO_Getter_Test_Sender_Impl
       }
     try
       {
-        this->invoker_->start_get_many (this->keys_, this->iterations_);
+        invoker->start_get_many (this->keys_, this->iterations_);
         ACE_Time_Value tv (1, 0);
         ACE_OS::sleep (tv);
-        this->writer_->write_many (write_many);
+        writer->write_many (write_many);
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_many : written <%u> samples\n"),
               write_many.length ()));
       }
@@ -159,13 +167,20 @@ namespace CIAO_Getter_Test_Sender_Impl
   void
   Sender_exec_i::tick (void)
   {
+    ::Getter_Test::GetterTestConnector::Writer_var writer =
+      this->context_->get_connection_info_write_data ();
+    ::Getter_Test::GetterFixedConnector::Writer_var fixed =
+      this->context_->get_connection_info_fixed_data ();
+    GetInvoker_var invoker =
+      this->context_->get_connection_invoke_getter ();
+
     if (this->last_iter_ <= this->iterations_)
       {
         GetterFixed  fixed_key;
         GetterTest *new_key = new GetterTest;
         new_key->key = CORBA::string_dup("KEY_1");
         fixed_key.key = 1;
-        this->invoker_->start_get_one (
+        invoker->start_get_one (
                         CORBA::string_dup("KEY_1"),
                         1,
                         last_iter_);
@@ -175,8 +190,8 @@ namespace CIAO_Getter_Test_Sender_Impl
         ACE_Time_Value tv (0, 50000);
         ACE_OS::sleep (tv);
 
-        this->writer_->write_one (*new_key, ::DDS::HANDLE_NIL);
-        this->fixed_->write_one (fixed_key, ::DDS::HANDLE_NIL);
+        writer->write_one (*new_key, ::DDS::HANDLE_NIL);
+        fixed->write_one (fixed_key, ::DDS::HANDLE_NIL);
         ACE_DEBUG ((LM_DEBUG, "Written keys <%C> and <%u> with <%d>\n",
                     new_key->key.in (), fixed_key.key, last_iter_));
 
@@ -241,9 +256,6 @@ namespace CIAO_Getter_Test_Sender_Impl
   {
     try
       {
-        this->writer_ = this->context_->get_connection_info_write_data ();
-        this->fixed_ = this->context_->get_connection_info_fixed_data ();
-        this->invoker_ = this->context_->get_connection_invoke_getter ();
         this->ccm_activated_ = true;
       }
     catch (const CORBA::Exception& ex)
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
index 88e16d42c88..f093ce86d91 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
@@ -102,9 +102,6 @@ namespace CIAO_Getter_Test_Sender_Impl
 
   private:
     ::Getter_Test::CCM_Sender_Context_var context_;
-    ::Getter_Test::GetterTestConnector::Writer_var writer_;
-    ::Getter_Test::GetterFixedConnector::Writer_var fixed_;
-    GetInvoker_var invoker_;
 
     CORBA::UShort iterations_;
     CORBA::UShort keys_;
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h
index 3127e1b99cf..0c0170524a5 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component_exec.h
@@ -97,9 +97,6 @@ namespace CIAO_PortUsageEvent_Test_PortUsageEventComponent_Impl
 
   private:
     ::PortUsageEvent_Test::CCM_PortUsageEventComponent_Context_var context_;
-    ::PortUsageEvent_Test::PortUsageTestConnector::Reader_var reader_; //Listener
-    ::PortUsageEvent_Test::PortUsageTestConnector::Writer_var writer_; //Writer
-    ::PortUsageEvent_Test::PortUsageTestConnector::Getter_var getter_; //Getter
 
     PORT_USAGE_ASSIGNMENT assignment_;
 
@@ -107,14 +104,11 @@ namespace CIAO_PortUsageEvent_Test_PortUsageEventComponent_Impl
     Atomic_ULong datawriters_count_;
 
     // Supported operations and attributes.
-    void
-    check_writer (void);
+    void check_writer (void);
 
-    void
-    check_getter (void);
+    void check_getter (void);
 
-    void
-    check_listener (void);
+    void check_listener (void);
   };
 
   extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
index a997ce86aa8..dfebea2fe88 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.cpp
@@ -37,7 +37,7 @@ namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl
     ::DDS::DataReader_ptr /*the_reader*/,
     const DDS::RequestedIncompatibleQosStatus & /*status*/)
   {
-  }
+  } 
 
   void ConnectorStatusListener_exec_i::on_sample_rejected (
     ::DDS::DataReader_ptr /*the_reader*/,
@@ -345,7 +345,6 @@ namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl
           ACE_ERROR ((LM_ERROR, "Component_exec_i::ccm_remove - "
                                 "ERROR : Unknown assignment\n"));
           break;
-
       }
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h
index 9106584f9de..a86a461923a 100644
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component_exec.h
@@ -106,9 +106,6 @@ namespace CIAO_PortUsageState_Test_PortUsageStateComponent_Impl
 
   private:
     ::PortUsageState_Test::CCM_PortUsageStateComponent_Context_var context_;
-    ::PortUsageState_Test::PortUsageTestConnector::Reader_var reader_; //Listener
-    ::PortUsageState_Test::PortUsageTestConnector::Writer_var writer_; //Writer
-    ::PortUsageState_Test::PortUsageTestConnector::Getter_var getter_; //Getter
 
     PORT_USAGE_ASSIGNMENT assignment_;