diff options
Diffstat (limited to 'TAO/tao/UIOP_Connect.cpp')
| -rw-r--r-- | TAO/tao/UIOP_Connect.cpp | 57 |
1 files changed, 16 insertions, 41 deletions
diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp index c11308ff822..05dda5f23f5 100644 --- a/TAO/tao/UIOP_Connect.cpp +++ b/TAO/tao/UIOP_Connect.cpp @@ -1,11 +1,11 @@ // $Id$ - #include "tao/UIOP_Connect.h" #if TAO_HAS_UIOP == 1 #include "tao/UIOP_Transport.h" +#include "tao/GIOP.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" @@ -20,9 +20,6 @@ ACE_RCSID(tao, UIOP_Connect, "$Id$") -#include "tao/GIOP_Message_Acceptors.h" -#include "tao/GIOP_Message_Lite.h" - #if defined (ACE_ENABLE_TIMEPROBES) static const char *TAO_UIOP_Connect_Timeprobe_Description[] = @@ -77,8 +74,7 @@ TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (ACE_Thre transport_ (this, 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 @@ -88,31 +84,17 @@ TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (ACE_Thre ACE_ASSERT (this->orb_core_ != 0); } -TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core, - CORBA::Boolean flag) +TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core) : TAO_UIOP_Handler_Base (orb_core), transport_ (this, orb_core), 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_UIOP_Server_Connection_Handler::~TAO_UIOP_Server_Connection_Handler (void) { - - delete this->acceptor_factory_; } int @@ -267,12 +249,11 @@ TAO_UIOP_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, @@ -312,12 +293,11 @@ TAO_UIOP_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; @@ -332,19 +312,15 @@ TAO_UIOP_Server_Connection_Handler::handle_input_i (ACE_HANDLE, TAO_UIOP_Client_Connection_Handler:: TAO_UIOP_Client_Connection_Handler (ACE_Thread_Manager *t, - TAO_ORB_Core* orb_core, - CORBA::Boolean flag) + TAO_ORB_Core* orb_core) : TAO_UIOP_Handler_Base (t), transport_ (this, orb_core), - orb_core_ (orb_core), - lite_flag_ (flag) + orb_core_ (orb_core) { - this->transport_.use_lite (flag); } TAO_UIOP_Client_Connection_Handler::~TAO_UIOP_Client_Connection_Handler (void) { - delete this->mesg_factory_; } // @@ Should I do something here to enable non-blocking?? (Alex). @@ -519,7 +495,6 @@ TAO_UIOP_Client_Connection_Handler::handle_cleanup (void) return 0; } - // **************************************************************** #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) |