Wed Feb 29 09:38:23 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h:
        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
        * orbsvcs/tests/AVStreams/Multicast/ftp.h:
        * orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
          Fixed coverity error

5 files changed, 14 insertions, 7 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b1b2c4977d7..c8c20ecdca8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Feb 29 09:38:23 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+        * orbsvcs/tests/AVStreams/Multicast/ftp.h:
+        * orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
+          Fixed coverity error
+
 Wed Feb 29 07:21:40 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Compression/bzip2/Bzip2Compressor.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 6860cb8f6e6..eb298513d6e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -26,7 +26,8 @@ TAO::SSLIOP::Connection_Handler::Connection_Handler (
     ACE_Thread_Manager *t)
   : SVC_HANDLER (t, 0 , 0),
     TAO_Connection_Handler (0),
-    current_ ()
+    current_ (),
+    tcp_properties_ (0)
 {
   // This constructor should *never* get called, it is just here to
   // make the compiler happy: the default implementation of the
@@ -39,7 +40,8 @@ TAO::SSLIOP::Connection_Handler::Connection_Handler (
 TAO::SSLIOP::Connection_Handler::Connection_Handler (TAO_ORB_Core *orb_core)
   : SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
     TAO_Connection_Handler (orb_core),
-    current_ ()
+    current_ (),
+    tcp_properties_ (0)
 {
   this->current_ = TAO::SSLIOP::Util::current (orb_core);
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
index 2e4e4d3de95..07b0f26376b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
@@ -126,7 +126,6 @@ namespace TAO
 
       /// TCP configuration for this connection.
       TAO_IIOP_Properties *tcp_properties_;
-
     };
 
     // ****************************************************************
@@ -178,9 +177,7 @@ namespace TAO
       /// Flag that specifies whether or not setup of the SSLIOP::Current
       /// object completed for the current thread and invocation.
       bool setup_done_;
-
     };
-
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 6535bea33bd..625778d0a49 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -3,7 +3,7 @@
 #include "ftp.h"
 
 FTP_Client_Callback::FTP_Client_Callback (void)
-  :count_ (0)
+  : count_ (0)
 {
 }
 
@@ -15,6 +15,7 @@ FTP_Client_Callback::handle_end_stream (void)
 }
 
 FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint (void)
+  : callback_ (0)
 {
 
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
index dd617a30c2c..f01e1bad8bc 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
@@ -42,7 +42,6 @@ public:
   virtual int set_protocol_object (const char *flowname,
                                    TAO_AV_Protocol_Object *object);
 protected:
-  //  FTP_Client_Flow_Handler *handler_;
   FTP_Client_Callback *callback_;
 };