diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-02-17 15:15:36 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-02-17 15:15:36 +0000 |
| commit | 2d7e65f24a469f66bd2771c7075a535eed2e81af (patch) | |
| tree | 91314d936e7b751a6a1180b4cd355b9441b120a4 /TAO/tao/IIOP_Acceptor.cpp | |
| parent | af3205b287c746e39b7f865019eed6d5a83166c3 (diff) | |
| download | ATCD-2d7e65f24a469f66bd2771c7075a535eed2e81af.tar.gz | |
Tue Feb 17 15:14:39 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/ORB_Core.cpp:
* tao/orbconf.h:
Added TAO_SO_LINGER, TAO_ACCEPT_ERROR_DELAY and
TAO_USE_PARALLEL_CONNECT which can be set in config.h
to control the default values.
* tao/ORB_Core.cpp:
* tao/IIOP_Acceptor.cpp:
* tao/params.h:
* tao/params.inl:
* tao/Profile.cpp:
Changed std_profile_components to a real bool
Diffstat (limited to 'TAO/tao/IIOP_Acceptor.cpp')
| -rw-r--r-- | TAO/tao/IIOP_Acceptor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index a7ec89ccf4d..d831ae84399 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -143,7 +143,7 @@ TAO_IIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key, // Do not add any tagged components to the profile if configured // by the user not to do so, or if an IIOP 1.0 endpoint is being // created (IIOP 1.0 did not support tagged components). - if (this->orb_core_->orb_params ()->std_profile_components () == 0 + if (!this->orb_core_->orb_params ()->std_profile_components () || (this->version_.major == 1 && this->version_.minor == 0)) continue; @@ -202,7 +202,7 @@ TAO_IIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key, // Do not add any tagged components to the profile if configured // by the user not to do so, or if an IIOP 1.0 endpoint is being // created (IIOP 1.0 did not support tagged components). - if (this->orb_core_->orb_params ()->std_profile_components () != 0 + if (this->orb_core_->orb_params ()->std_profile_components () && (this->version_.major >= 1 && this->version_.minor >= 1)) { iiop_profile->tagged_components ().set_orb_type (TAO_ORB_TYPE); |