ChangeLogTag:Thu Jul 5 23:00:43 2001 Balachandran Natarajan <bala@cs.wustl.edu>

4 files changed, 12 insertions, 51 deletions

diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index bd7301db559..aae2a59c697 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -14,7 +14,7 @@
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/IIOP_Endpoint.h"
 #include "tao/Transport_Cache_Manager.h"
-
+#include "tao/Resume_Handle.h"
 
 #if !defined (__ACE_INLINE__)
 # include "SSLIOP_Connection_Handler.i"
@@ -339,7 +339,7 @@ TAO_SSLIOP_Connection_Handler::process_listen_point_list (
 
 
 int
-TAO_SSLIOP_Connection_Handler::handle_input (ACE_HANDLE h)
+TAO_SSLIOP_Connection_Handler::handle_input (ACE_HANDLE)
 {
     // Increase the reference count on the upcall that have passed us.
   this->pending_upcalls_++;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
index 34a4696cf52..d109a1ed164 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
@@ -101,7 +101,7 @@ public:
   virtual int handle_output (ACE_HANDLE);
 
   /// Doumented in ACE_Event_Handler
-  virtual int resume_handle (void);
+  virtual int resume_handler (void);
 
   /// Add ourselves to Cache.
   int add_transport_to_cache (void);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index 7bdae83ce0e..aa74f58ad63 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -77,7 +77,7 @@ TAO_SSLIOP_Transport::handle_input_i (TAO_Resume_Handle &rh,
   int result = 0;
 
   // Set up the SSLIOP::Current object.
-  TAO_SSL_State_Guard ssl_state_guard (this,
+  TAO_SSL_State_Guard ssl_state_guard (this->connection_handler_,
                                        this->orb_core (),
                                        result);
   if (result == -1)
@@ -144,42 +144,6 @@ TAO_SSLIOP_Transport::recv_i (char *buf,
 }
 
 
-int
-TAO_SSLIOP_Transport::read_process_message (ACE_Time_Value *max_wait_time,
-                                            int block)
-{
-  // Read the message of the socket
-  int result =  this->messaging_object_->read_message (this,
-                                                       block,
-                                                       max_wait_time);
-
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - %p\n"),
-                    ACE_TEXT ("SSLIOP_Transport::read_message, failure in read_message ()")));
-
-      this->tms_->connection_closed ();
-      return -1;
-    }
-  if (result < 2)
-    return result;
-
-  // Now we know that we have been able to read the complete message
-  // here.. We loop here to see whether we have read more than one
-  // message in our read.
-  // Set the result state
-  result = 1;
-
-  // See we use the reactor semantics again
-  while (result > 0)
-    {
-      result = this->process_message ();
-    }
-
-  return result;
-}
 
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
index 3cf25a90dc2..2b92f3ff646 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
@@ -71,6 +71,14 @@ public:
   virtual ACE_HANDLE handle (void);
 #endif
 
+
+  /// Overload of the handle_input_i () in the TAO_Transport
+  /// class. This is required to set up the state guard. The
+  /// thread-per-connection and wait on RW strategies call this
+  /// handle_input_i ().
+  virtual int handle_input_i (TAO_Resume_Handle &rh,
+                              ACE_Time_Value *max_wait_time = 0,
+                              int block = 0);
 protected:
   /** @name Overridden Template Methods
    *
@@ -82,9 +90,6 @@ protected:
 
   virtual TAO_Pluggable_Messaging *messaging_object (void);
 
-  virtual int handle_input_i (TAO_Resume_Handle &rh,
-                              ACE_Time_Value *max_wait_time = 0,
-                              int block = 0);
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send_i (iovec *iov, int iovcnt,
@@ -96,14 +101,6 @@ protected:
                           size_t len,
                           const ACE_Time_Value *s = 0);
 
-  /// Overload of the handle_input_i () in the TAO_Transport
-  /// class. This is required to set up the state guard. The
-  /// thread-per-connection and wait on RW strategies call this
-  /// handle_input_i ().
-  virtual int handle_input_i (TAO_Resume_Handle &rh,
-                              ACE_Time_Value *max_time_value = 0,
-                              int block =0);
-
   virtual int register_handler_i (void);
 
   /// Method to do whatever it needs to do when the connection