1 files changed, 5 insertions, 63 deletions

diff --git a/TAO/tao/SHMIOP_Connect.cpp b/TAO/tao/SHMIOP_Connect.cpp
index 05ea5472dd9..0aa4bccffe8 100644
--- a/TAO/tao/SHMIOP_Connect.cpp
+++ b/TAO/tao/SHMIOP_Connect.cpp
@@ -9,7 +9,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/CDR.h"
-#include "tao/GIOP_Message_Connectors.h"
 #include "tao/GIOP_Message_Acceptors.h"
 #include "tao/GIOP_Message_Lite.h"
 
@@ -104,13 +103,6 @@ TAO_SHMIOP_Server_Connection_Handler::TAO_SHMIOP_Server_Connection_Handler (TAO_
       ACE_NEW (this->acceptor_factory_,
                TAO_GIOP_Message_Acceptors (orb_core));
     }
-    
-    // OK, Here is a small twist. By now the all the objecs cached in
-  // this class would have been constructed. But we would like to make
-  // the one of the objects, precisely the transport object a pointer
-  // to the Messaging object. So, we set this up properly by calling
-  // the messaging_init method on the transport. 
-  this->transport_.messaging_init (this->acceptor_factory_);
 }
 
 TAO_SHMIOP_Server_Connection_Handler::~TAO_SHMIOP_Server_Connection_Handler (void)
@@ -355,11 +347,14 @@ TAO_SHMIOP_Server_Connection_Handler::handle_input_i (ACE_HANDLE,
 //    transport obj.
 TAO_SHMIOP_Client_Connection_Handler::
 TAO_SHMIOP_Client_Connection_Handler (ACE_Thread_Manager *t,
-                                      TAO_ORB_Core* orb_core)
+                                      TAO_ORB_Core* orb_core,
+                                      CORBA::Boolean flag)
   : TAO_SHMIOP_Handler_Base (t),
     transport_ (this, orb_core),
-    orb_core_ (orb_core)
+    orb_core_ (orb_core),
+    lite_flag_ (flag)
 {
+  this->transport_.use_lite (lite_flag_);
 }
 
 TAO_SHMIOP_Client_Connection_Handler::~TAO_SHMIOP_Client_Connection_Handler (void)
@@ -526,59 +521,6 @@ TAO_SHMIOP_Client_Connection_Handler::handle_cleanup (void)
   return 0;
 }
 
-int
-TAO_SHMIOP_Client_Connection_Handler::
-  init_mesg_protocol (CORBA::Octet major, 
-                      CORBA::Octet minor) 
-{
-  if (major == TAO_DEF_GIOP_LITE_MAJOR &&
-      minor == TAO_DEF_GIOP_LITE_MINOR)
-    {
-      ACE_NEW_RETURN  (this->mesg_factory_,
-                       TAO_GIOP_Message_Lite,
-                       -1);
-    }
-  else if (major == TAO_DEF_GIOP_MAJOR)
-    {
-      if (minor > TAO_DEF_GIOP_MINOR)
-        minor = TAO_DEF_GIOP_MINOR;
-      switch (minor)
-        {
-        case 0:
-          ACE_NEW_RETURN  (this->mesg_factory_,
-                           TAO_GIOP_Message_Connector_10,
-                           0);
-          break;
-        case 1:
-          ACE_NEW_RETURN  (this->mesg_factory_,
-                           TAO_GIOP_Message_Connector_11,
-                           0);
-          break;
-        default:
-          if (TAO_debug_level > 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ASYS_TEXT ("(%N|%l|%p|%t) No matching minor version number \n")),
-                                0);
-            }
-        }
-    }
-  else
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N|%l|%p|%t) No matching major version number \n")), 
-                            0);
-        }
-    }
-
-  // Make the transport know 
-  this->transport_.messaging_init (this->mesg_factory_);
-
-  return 1;
-}
-
 // ****************************************************************
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)