ChangeLogTag: Sat Apr 27 18:04:47 2002 Balachandran Natarajan <bala@guajira.cs.wustl.edu>

4 files changed, 11 insertions, 8 deletions

diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index fc9ea12a655..c76c6a8b529 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -78,7 +78,7 @@ TAO_IIOP_SSL_Connector::open (TAO_ORB_Core *orb_core)
   // here. Ossama mentions that non-blocking may not work
   // properly. Keeping it as blocked till someone decides to fall in
   // line with protocols like IIOP.
-  ACE_NEW_RETURN (this->active_connection_strategy_,
+  ACE_NEW_RETURN (this->active_connect_strategy_,
                   TAO_Blocked_Connect_Strategy (orb_core),
                   -1);
 
@@ -192,7 +192,7 @@ TAO_IIOP_SSL_Connector::make_connection (
   this->active_connect_strategy_->synch_options (max_wait_time,
                                                  synch_options);
 
-  TAO_IIOP_Connection_Handler *svc_handler = 0;
+  TAO_IIOP_SSL_Connection_Handler *svc_handler = 0;
 
    // Active connect
    int result = this->base_connector_.connect (svc_handler,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 1ac3dc827cd..b871c5c9f72 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -146,6 +146,9 @@ TAO_SSLIOP_Connection_Handler::open (void *)
   // compilers.
   this->transport ()->id ((int) this->get_handle ());
 
+  // @@ Not needed
+  this->state_changed (TAO_LF_Event::LFS_SUCCESS);
+
   return 0;
 }
 
@@ -230,13 +233,13 @@ TAO_SSLIOP_Connection_Handler::handle_close (ACE_HANDLE handle,
 
   // Try to clean up things if the upcall count has reached 0
   if (upcalls == 0)
-    this->handle_close_i (handle);
+    this->decr_refcount ();
 
   return 0;
 }
 
 void
-TAO_SSLIOP_Connection_Handler::handle_close_i (ACE_HANDLE)
+TAO_SSLIOP_Connection_Handler::handle_close_i (void)
 {
   if (TAO_debug_level)
     ACE_DEBUG  ((LM_DEBUG,
@@ -421,7 +424,7 @@ TAO_SSLIOP_Connection_Handler::handle_input (ACE_HANDLE)
   // Try to clean up things if the upcall count has reached 0
   if (upcalls == 0)
     {
-      this->handle_close_i (this->get_handle ());
+      this->decr_refcount ();
 
       // As we have already performed the handle closing we don't want
       // to return a -1. Doing so would make the reactor call
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
index 9aa89b66418..b96ae000c76 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
@@ -139,7 +139,7 @@ protected:
 private:
 
   /// Perform appropriate closing..
-  void handle_close_i (ACE_HANDLE);
+  void handle_close_i (void);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 3afac0adddf..46e11fb09e5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -15,7 +15,8 @@
 #include "tao/Invocation.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Stub.h"
-
+#include "tao/Transport_Connector.h"
+#include "tao/Connect_Strategy.h"
 #include "ace/Auto_Ptr.h"
 
 ACE_RCSID (TAO_SSLIOP,
@@ -339,7 +340,6 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint,
                                       ACE_ENV_ARG_DECL)
 {
   TAO_Transport *&transport = invocation->transport ();
-  ACE_Time_Value *max_wait_time = invocation->max_wait_time ();
 
   const SSLIOP::SSL &ssl_component = ssl_endpoint->ssl_component ();