diff options
Diffstat (limited to 'TAO/tao/IIOP_Connect.cpp')
| -rw-r--r-- | TAO/tao/IIOP_Connect.cpp | 62 |
1 files changed, 18 insertions, 44 deletions
diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp index 963eff518bd..ec7663896e0 100644 --- a/TAO/tao/IIOP_Connect.cpp +++ b/TAO/tao/IIOP_Connect.cpp @@ -6,10 +6,9 @@ #include "tao/ORB_Core.h" #include "tao/ORB.h" #include "tao/CDR.h" -#include "tao/Messaging_Policy_i.h" -#include "tao/GIOP_Message_Lite.h" -#include "tao/GIOP_Message_Acceptors.h" +#include "tao/GIOP.h" +#include "tao/Messaging_Policy_i.h" #if !defined (__ACE_INLINE__) # include "tao/IIOP_Connect.i" @@ -17,8 +16,6 @@ ACE_RCSID(tao, IIOP_Connect, "$Id$") - - #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_IIOP_Connect_Timeprobe_Description[] = @@ -70,11 +67,10 @@ TAO_IIOP_Handler_Base::TAO_IIOP_Handler_Base (ACE_Thread_Manager *t) TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (ACE_Thread_Manager *t) : TAO_IIOP_Handler_Base (t), transport_ (this, 0), - acceptor_factory_ (0), orb_core_ (0), tss_resources_ (0), - refcount_ (1), - lite_flag_ (0) + refcount_ (1) + { // This constructor should *never* get called, it is just here to // make the compiler happy: the default implementation of the @@ -84,32 +80,17 @@ TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (ACE_Thre ACE_ASSERT (this->orb_core_ != 0); } -TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag) +TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core) : TAO_IIOP_Handler_Base (orb_core), transport_ (this, orb_core), - acceptor_factory_ (0), orb_core_ (orb_core), tss_resources_ (orb_core->get_tss_resources ()), - refcount_ (1), - lite_flag_ (flag) + refcount_ (1) { - if (lite_flag_) - { - ACE_NEW (this->acceptor_factory_, - TAO_GIOP_Message_Lite (orb_core)); - } - else - { - ACE_NEW (this->acceptor_factory_, - TAO_GIOP_Message_Acceptors (orb_core)); - } - } TAO_IIOP_Server_Connection_Handler::~TAO_IIOP_Server_Connection_Handler (void) { - delete this->acceptor_factory_; } int @@ -283,11 +264,11 @@ TAO_IIOP_Server_Connection_Handler::handle_input_i (ACE_HANDLE, { this->refcount_++; - int result = this->acceptor_factory_->handle_input (this->transport (), - this->orb_core_, - this->transport_.message_state_, - max_wait_time); - + int result = TAO_GIOP::handle_input (this->transport (), + this->orb_core_, + this->transport_.message_state_, + max_wait_time); + if (result == -1 && TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, @@ -326,12 +307,12 @@ TAO_IIOP_Server_Connection_Handler::handle_input_i (ACE_HANDLE, // Reset the message state. this->transport_.message_state_.reset (0); - result = - this->acceptor_factory_->process_connector_messages (this->transport (), - this->orb_core_, - input_cdr, - message_type); + result = TAO_GIOP::process_server_message (this->transport (), + this->orb_core_, + input_cdr, + message_type, + giop_version); if (result != -1) result = 0; @@ -347,20 +328,15 @@ TAO_IIOP_Server_Connection_Handler::handle_input_i (ACE_HANDLE, // transport obj. TAO_IIOP_Client_Connection_Handler:: TAO_IIOP_Client_Connection_Handler (ACE_Thread_Manager *t, - TAO_ORB_Core* orb_core, - CORBA::Boolean flag) + TAO_ORB_Core* orb_core) : TAO_IIOP_Handler_Base (t), transport_ (this, orb_core), - orb_core_ (orb_core), - lite_flag_ (flag) + orb_core_ (orb_core) { - // Set the lite flag in the client transport - this->transport_.use_lite (flag); } TAO_IIOP_Client_Connection_Handler::~TAO_IIOP_Client_Connection_Handler (void) { - //no-op } @@ -550,8 +526,6 @@ TAO_IIOP_Client_Connection_Handler::handle_cleanup (void) return 0; } - - // **************************************************************** #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) |