ChangeLogTag: Thu Apr 20 20:14:14 2000 Balachandran Natarajan <bala@cs.wustl.edu>

7 files changed, 21 insertions, 60 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 451c19b9f94..9ed906b296b 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,17 @@
+Thu Apr 20 20:14:14 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* tao/IIOP_Transport.h: 
+	* tao/IIOP_Transport.cpp:
+	* tao/SHMIOP_Transport.cpp:
+	* tao/SHMIOP_Transport.h:
+	* tao/UIOP_Transport.h:
+	* tao/UIOP_Transport.cpp: Thanks to Phil Mesnier
+	  <mesnier_p@ociweb.com> for finding out that the Transport
+	  classes store two copies of the connection handler pointers. One
+	  of them was held by the concrete implementation classes and
+	  other by the base class. So, removed the redundant copy in the
+	  implementation class.
+
 Thu Apr 20 20:04:01 2000  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp:
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index bdb402e7d2b..a4419ea385c 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -113,7 +113,6 @@ TAO_IIOP_Server_Transport::
     TAO_IIOP_Server_Transport (TAO_IIOP_Server_Connection_Handler *handler,
                                TAO_ORB_Core* orb_core)
   : TAO_IIOP_Transport (handler, orb_core),
-    server_handler_ (handler),
     message_state_ (orb_core)
 {
 }
@@ -129,7 +128,6 @@ TAO_IIOP_Client_Transport::
                                TAO_ORB_Core *orb_core)
   :  TAO_IIOP_Transport (handler,
                          orb_core),
-     client_handler_ (handler),
      client_mesg_factory_ (0),
      orb_core_ (orb_core),
      lite_flag_ (0),
@@ -142,14 +140,6 @@ TAO_IIOP_Client_Transport::~TAO_IIOP_Client_Transport (void)
   delete this->client_mesg_factory_;
 }
 
-
-
-TAO_IIOP_Client_Connection_Handler *
-TAO_IIOP_Client_Transport::client_handler (void)
-{
-  return this->client_handler_;
-}
-
 void
 TAO_IIOP_Client_Transport::start_request (TAO_ORB_Core * /*orb_core*/,
                                           TAO_Target_Specification & /*spec */,
@@ -309,10 +299,10 @@ TAO_IIOP_Client_Transport::register_handler (void)
   // @@ It seems like this method should go away, the right reactor is
   //    picked at object creation time.
   ACE_Reactor *r = this->orb_core ()->reactor ();
-  if (r == this->client_handler ()->reactor ())
+  if (r == this->handler ()->reactor ())
     return 0;
 
-  return r->register_handler (this->client_handler (),
+  return r->register_handler (this->handler (),
                               ACE_Event_Handler::READ_MASK);
 }
 
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index 02d0d161eb1..5a36c05a1ba 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -115,9 +115,6 @@ public:
   ~TAO_IIOP_Client_Transport (void);
   // destructor
 
-  TAO_IIOP_Client_Connection_Handler *client_handler (void);
-  // return a pointer to the client's connection handler.
-
   // = The TAO_Transport methods, please check the documentation in
   //   "tao/Pluggable.h" for more details.
   virtual void start_request (TAO_ORB_Core *orb_core,
@@ -155,9 +152,6 @@ public:
   void use_lite (CORBA::Boolean flag);
   // Sets the lite flag
 private:
-  TAO_IIOP_Client_Connection_Handler *client_handler_;
-  // pointer to the corresponding client side connection handler.
-
   TAO_Pluggable_Messaging *client_mesg_factory_;
   // The message_factor instance specific for this particular
   // transport protocol.
@@ -193,9 +187,6 @@ public:
   ~TAO_IIOP_Server_Transport (void);
   // Default destructor
 
-  TAO_IIOP_Server_Connection_Handler *server_handler_;
-  // Pointer to the corresponding connection handler.
-
   TAO_GIOP_Message_State message_state_;
   // This keep the state of the current message, to enable
   // non-blocking reads, fragment reassembly, etc.
diff --git a/TAO/tao/SHMIOP_Transport.cpp b/TAO/tao/SHMIOP_Transport.cpp
index a193bfb9d52..f44ac86ec13 100644
--- a/TAO/tao/SHMIOP_Transport.cpp
+++ b/TAO/tao/SHMIOP_Transport.cpp
@@ -110,7 +110,6 @@ TAO_SHMIOP_Server_Transport::
     TAO_SHMIOP_Server_Transport (TAO_SHMIOP_Server_Connection_Handler *handler,
                                TAO_ORB_Core* orb_core)
   : TAO_SHMIOP_Transport (handler, orb_core),
-    server_handler_ (handler),
     message_state_ (orb_core)
 {
 }
@@ -126,7 +125,6 @@ TAO_SHMIOP_Client_Transport::
                                TAO_ORB_Core *orb_core)
   :  TAO_SHMIOP_Transport (handler,
                          orb_core),
-     client_handler_ (handler),
      client_mesg_factory_ (0),
      orb_core_ (orb_core),
      lite_flag_ (0),
@@ -139,11 +137,6 @@ TAO_SHMIOP_Client_Transport::~TAO_SHMIOP_Client_Transport (void)
   delete this->client_mesg_factory_;
 }
 
-TAO_SHMIOP_Client_Connection_Handler *
-TAO_SHMIOP_Client_Transport::client_handler (void)
-{
-  return this->client_handler_;
-}
 
 void
 TAO_SHMIOP_Client_Transport::start_request (TAO_ORB_Core * /*orb_core*/,
@@ -303,10 +296,10 @@ TAO_SHMIOP_Client_Transport::register_handler (void)
   // @@ It seems like this method should go away, the right reactor is
   //    picked at object creation time.
   ACE_Reactor *r = this->orb_core ()->reactor ();
-  if (r == this->client_handler ()->reactor ())
+  if (r == this->handler ()->reactor ())
     return 0;
 
-  return r->register_handler (this->client_handler (),
+  return r->register_handler (this->handler (),
                               ACE_Event_Handler::READ_MASK);
 }
 
diff --git a/TAO/tao/SHMIOP_Transport.h b/TAO/tao/SHMIOP_Transport.h
index 554a309061a..715c0224f43 100644
--- a/TAO/tao/SHMIOP_Transport.h
+++ b/TAO/tao/SHMIOP_Transport.h
@@ -113,9 +113,6 @@ public:
   ~TAO_SHMIOP_Client_Transport (void);
   // destructor
 
-  TAO_SHMIOP_Client_Connection_Handler *client_handler (void);
-  // return a pointer to the client's connection handler.
-
   // = The TAO_Transport methods, please check the documentation in
   //   "tao/Pluggable.h" for more details.
   virtual void start_request (TAO_ORB_Core *orb_core,
@@ -152,9 +149,6 @@ public:
   // Sets the lite flag
   
 private:
-  TAO_SHMIOP_Client_Connection_Handler *client_handler_;
-  // pointer to the corresponding client side connection handler.
-  
   TAO_Pluggable_Messaging *client_mesg_factory_;
   // The message_factor instance specific for this particular
   // transport protocol.
@@ -190,9 +184,6 @@ public:
   ~TAO_SHMIOP_Server_Transport (void);
   // Default destructor
   
-  TAO_SHMIOP_Server_Connection_Handler *server_handler_;
-  // Pointer to the corresponding connection handler.
-
   TAO_GIOP_Message_State message_state_;
   // This keep the state of the current message, to enable
   // non-blocking reads, fragment reassembly, etc.
diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp
index 3ebcb3165fa..54251e9fbde 100644
--- a/TAO/tao/UIOP_Transport.cpp
+++ b/TAO/tao/UIOP_Transport.cpp
@@ -116,7 +116,6 @@ TAO_UIOP_Server_Transport::
                                TAO_ORB_Core* orb_core)
   : TAO_UIOP_Transport (handler,
                         orb_core),
-    server_handler_ (handler),
     message_state_ (orb_core)
 {
 }
@@ -131,7 +130,6 @@ TAO_UIOP_Client_Transport::
     TAO_UIOP_Client_Transport (TAO_UIOP_Client_Connection_Handler *handler,
                                TAO_ORB_Core *orb_core)
   :  TAO_UIOP_Transport (handler, orb_core),
-     client_handler_ (handler),
      client_mesg_factory_ (0),
      orb_core_ (orb_core),
      lite_flag_ (0),
@@ -145,12 +143,6 @@ TAO_UIOP_Client_Transport::~TAO_UIOP_Client_Transport (void)
 }
 
 
-TAO_UIOP_Client_Connection_Handler *
-TAO_UIOP_Client_Transport::client_handler (void)
-{
-  return this->client_handler_;
-}
-
 void
 TAO_UIOP_Client_Transport::start_request (TAO_ORB_Core * /*orb_core*/,
                                           TAO_Target_Specification & /*spec*/,
@@ -313,10 +305,10 @@ TAO_UIOP_Client_Transport::register_handler (void)
   // @@ It seems like this method should go away, the right reactor is
   //    picked at object creation time.
   ACE_Reactor *r = this->orb_core ()->reactor ();
-  if (r == this->client_handler ()->reactor ())
+  if (r == this->handler ()->reactor ())
     return 0;
-
-  return r->register_handler (this->client_handler (),
+  
+  return r->register_handler (this->handler (),
                               ACE_Event_Handler::READ_MASK);
 }
 
diff --git a/TAO/tao/UIOP_Transport.h b/TAO/tao/UIOP_Transport.h
index 335701e4faf..f47317b4c51 100644
--- a/TAO/tao/UIOP_Transport.h
+++ b/TAO/tao/UIOP_Transport.h
@@ -119,9 +119,6 @@ public:
   ~TAO_UIOP_Client_Transport (void);
   // destructor
 
-  TAO_UIOP_Client_Connection_Handler *client_handler (void);
-  // return a pointer to the client's connection handler.
-
   // = The TAO_Transport methods, please check the documentation in
   //   "tao/Pluggable.h" for more details.
   virtual void start_request (TAO_ORB_Core *orb_core,
@@ -161,9 +158,6 @@ public:
   // Set the lite flag
 
 private:
-  TAO_UIOP_Client_Connection_Handler *client_handler_;
-  // pointer to the corresponding client side connection handler.
-
   TAO_Pluggable_Messaging *client_mesg_factory_;
   // The message_factor instance specific for this particular
   // transport protocol.
@@ -199,13 +193,9 @@ public:
   ~TAO_UIOP_Server_Transport (void);
   // Default destructor
 
-  TAO_UIOP_Server_Connection_Handler *server_handler_;
-  // Pointer to the corresponding connection handler.
-
   TAO_GIOP_Message_State message_state_;
   // This keep the state of the current message, to enable
   // non-blocking reads, fragment reassembly, etc.
-
 };
 
 #if defined (__ACE_INLINE__)