Wed Apr 11 10:41:14 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h:
        * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h:
        * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp:
        * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h:
        * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp:
        * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp:
        * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h:
        * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp:
          Coverity fixes

9 files changed, 39 insertions, 24 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 9784c640a7b..8c6f60dd55c 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Wed Apr 11 10:41:14 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h:
+        * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h:
+        * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp:
+        * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h:
+        * connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp:
+        * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp:
+        * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h:
+        * connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp:
+          Coverity fixes
+
 Fri Apr 06 09:03:19 CEST 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * CIAO version 1.1.1 released.
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
index 91a26023d43..602e820ac59 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
@@ -59,7 +59,6 @@ namespace CIAO_Hello_Receiver_Impl
   private:
     ::Hello::CCM_Receiver_Context_var context_;
     ::Hello::CCM_MyFoo_var ciao_do_my_foo_;
-
   };
 
   extern "C" HELLO_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
index 825b5875927..8e34aa0de7a 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
@@ -86,7 +86,7 @@ namespace CIAO_Hello_Sender_Impl
   //============================================================
   asynch_foo_generator::asynch_foo_generator (
      ::Hello::CCM_Sender_Context_ptr context)
-   : context_(::Hello::CCM_Sender_Context::_duplicate (context))
+   : ciao_context_(::Hello::CCM_Sender_Context::_duplicate (context))
   {
   }
 
@@ -94,7 +94,7 @@ namespace CIAO_Hello_Sender_Impl
   {
     ACE_OS::sleep (3);
     ::Hello::AMI4CCM_MyFoo_var my_foo_ami_  =
-       context_->get_connection_sendc_run_my_foo();
+       ciao_context_->get_connection_sendc_run_my_foo();
 
     if (CORBA::is_nil (my_foo_ami_))
       {
@@ -137,7 +137,7 @@ namespace CIAO_Hello_Sender_Impl
   //============================================================
   synch_foo_generator::synch_foo_generator (
      ::Hello::CCM_Sender_Context_ptr context)
-  : context_(::Hello::CCM_Sender_Context::_duplicate (context))
+  : ciao_context_(::Hello::CCM_Sender_Context::_duplicate (context))
   {
   }
 
@@ -145,7 +145,7 @@ namespace CIAO_Hello_Sender_Impl
   {
     ACE_OS::sleep (3);
     ::Hello::MyFoo_var my_foo_ami_ =
-         context_->get_connection_run_my_foo ();
+         ciao_context_->get_connection_run_my_foo ();
 
     //run synch calls
     CORBA::String_var out_str;
@@ -240,7 +240,9 @@ namespace CIAO_Hello_Sender_Impl
   //============================================================
   // Component Executor Implementation Class: Sender_exec_i
   //============================================================
-  Sender_exec_i::Sender_exec_i (void)
+  Sender_exec_i::Sender_exec_i (void) :
+    asynch_foo_gen_ (0),
+    synch_foo_gen_ (0)
   {
   }
 
@@ -259,9 +261,9 @@ namespace CIAO_Hello_Sender_Impl
   Sender_exec_i::set_session_context (
      ::Components::SessionContext_ptr ctx)
   {
-    this->context_ =
+    this->ciao_context_ =
       ::Hello::CCM_Sender_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
+    if ( ::CORBA::is_nil (this->ciao_context_.in ()))
       {
         throw ::CORBA::INTERNAL ();
       }
@@ -276,10 +278,10 @@ namespace CIAO_Hello_Sender_Impl
   Sender_exec_i::ccm_activate (void)
   {
     this->asynch_foo_gen_ =
-      new asynch_foo_generator (this->context_.in ());
+      new asynch_foo_generator (this->ciao_context_.in ());
     this->asynch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1);
     this->synch_foo_gen_ =
-       new synch_foo_generator (this->context_.in());
+       new synch_foo_generator (this->ciao_context_.in());
     this->synch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1);
   }
 
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h
index 1587775550d..955ec41ed0c 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.h
@@ -60,7 +60,7 @@ namespace CIAO_Hello_Sender_Impl
     virtual int svc (void);
 
   private:
-    ::Hello::CCM_Sender_Context_var context_;
+    ::Hello::CCM_Sender_Context_var ciao_context_;
   };
 
   /// Worker thread for synchronous invocations
@@ -125,7 +125,6 @@ namespace CIAO_Hello_Sender_Impl
     //@{
     /** User defined private operations. */
   private:
-    ::Hello::CCM_Sender_Context_var context_;
     asynch_foo_generator* asynch_foo_gen_;
     synch_foo_generator* synch_foo_gen_;
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp
index caa2134d358..9c5ea3e1fba 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.cpp
@@ -133,7 +133,9 @@ namespace CIAO_InterOutArgsT_Sender_Impl
    */
 
   Sender_exec_i::Sender_exec_i (void)
-  : nr_of_received_(0)
+  : asynch_foo_gen (0),
+    synch_foo_gen (0),
+    nr_of_received_(0)
   {
   }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h
index f334c7b4cf2..54752d54afb 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender_exec.h
@@ -82,8 +82,6 @@ namespace CIAO_InterOutArgsT_Sender_Impl
   public:
     Sender_exec_i (void);
     virtual ~Sender_exec_i (void);
-    asynch_foo_generator* asynch_foo_gen;
-    synch_foo_generator* synch_foo_gen;
     //@{
     /** Supported operations and attributes. */
 
@@ -115,6 +113,8 @@ namespace CIAO_InterOutArgsT_Sender_Impl
 
     //@{
     /** User defined members. */
+    asynch_foo_generator* asynch_foo_gen;
+    synch_foo_generator* synch_foo_gen;
     Atomic_UShort nr_of_received_;
     //@}
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
index bfdd02d4e06..201b86e875c 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
@@ -212,7 +212,9 @@ namespace CIAO_InterReturnT_Sender_Impl
    */
 
   Sender_exec_i::Sender_exec_i (void)
-  : nr_of_received_(0)
+  : asynch_foo_gen (0),
+    synch_foo_gen (0),
+    nr_of_received_(0)
   {
   }
 
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h
index 024e09e6af4..73d584dfdd3 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h
@@ -111,24 +111,20 @@ namespace CIAO_PragmaT_Sender_Impl
     //@}
 
   private:
-    ::PragmaT::CCM_Sender_Context_var ciao_context_;
-
     //@{
     /** Component attributes. */
     //@}
 
     //@{
     /** User defined members. */
-
+    ::PragmaT::CCM_Sender_Context_var context_;
+    asynch_foo_generator* asynch_foo_gen_;
+    synch_foo_generator* synch_foo_gen_;
     //@}
 
     //@{
     /** User defined private operations. */
   private:
-    ::PragmaT::CCM_Sender_Context_var context_;
-    asynch_foo_generator* asynch_foo_gen_;
-    synch_foo_generator* synch_foo_gen_;
-
     //@}
   };
 
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp
index 90d453331cf..3c82a243a2a 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp_exec.cpp
@@ -157,7 +157,10 @@ namespace CIAO_Hello_Sender_comp_Impl
   //============================================================
   // Component Executor Implementation Class: Sender_comp_exec_i
   //============================================================
-  Sender_comp_exec_i::Sender_comp_exec_i (void){
+  Sender_comp_exec_i::Sender_comp_exec_i (void) :
+    asynch_foo_gen (0),
+    synch_foo_gen (0)
+  {
   }
 
   Sender_comp_exec_i::~Sender_comp_exec_i (void)