diff options
Diffstat (limited to 'TAO/tao/IIOP_Acceptor.cpp')
| -rw-r--r-- | TAO/tao/IIOP_Acceptor.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index d041ca9878b..3f30c643955 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -6,6 +6,7 @@ #include "tao/MProfile.h" #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" +#include "tao/GIOP.h" #include "tao/debug.h" #include "ace/Auto_Ptr.h" @@ -42,7 +43,7 @@ template class TAO_Accept_Strategy<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag) +TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void) : TAO_Acceptor (TAO_TAG_IIOP_PROFILE), addrs_ (0), hosts_ (0), @@ -52,8 +53,7 @@ TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag) base_acceptor_ (), creation_strategy_ (0), concurrency_strategy_ (0), - accept_strategy_ (0), - lite_flag_ (flag) + accept_strategy_ (0) { } @@ -254,14 +254,8 @@ TAO_IIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, size_t if_cnt = 0; if (ACE::get_ip_interfaces (if_cnt, - if_addrs) != 0 - && errno != ENOTSUP) - { - // In the case of errno == ENOTSUP, if_cnt and if_addrs will not - // be modified, and will each remain equal to zero. This causes - // the default interface to be used. - return -1; - } + if_addrs) != 0) + return -1; if (if_cnt == 0 || if_addrs == 0) { @@ -363,8 +357,7 @@ TAO_IIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, this->orb_core_ = orb_core; ACE_NEW_RETURN (this->creation_strategy_, - TAO_IIOP_CREATION_STRATEGY (this->orb_core_, - this->lite_flag_), + TAO_IIOP_CREATION_STRATEGY (this->orb_core_), -1); ACE_NEW_RETURN (this->concurrency_strategy_, |