diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2003-03-11 02:22:37 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2003-03-11 02:22:37 +0000 |
| commit | d09cf9f3bbf5362bc0af83091e231c5f86c6311f (patch) | |
| tree | 4d3461f57ea66004266a047ffb4d34b3320d3784 | |
| parent | f957f74a98814ec13a57145c4299fd4919142b92 (diff) | |
| download | ATCD-d09cf9f3bbf5362bc0af83091e231c5f86c6311f.tar.gz | |
ChangeLog tag: Mon Mar 10 20:24:17 2003 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp | 17 |
2 files changed, 10 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index fa61bd7ce6b..aad4a439bc4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 10 20:24:17 2003 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp: Make the SSLIOP + connector get the codeset context assigned by the Codeset Manager. + Mon Mar 10 11:03:14 2003 Ossama Othman <ossama@uci.edu> * tao/DynamicInterface/DII_ClientRequestInfo.h (request_): diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index ff114feb8d5..4eb1b39f0ef 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -11,6 +11,7 @@ #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" #include "tao/debug.h" +#include "tao/Codeset_Manager.h" #if !defined(__ACE_INLINE__) #include "SSLIOP_Acceptor.i" @@ -157,12 +158,8 @@ TAO_SSLIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key, pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE); - CONV_FRAME::CodeSetComponentInfo code_set_info; - code_set_info.ForCharData.native_code_set = - TAO_DEFAULT_CHAR_CODESET_ID; - code_set_info.ForWcharData.native_code_set = - TAO_DEFAULT_WCHAR_CODESET_ID; - pfile->tagged_components ().set_code_sets (code_set_info); + this->orb_core_->codeset_manager()-> + set_codeset(pfile->tagged_components()); IOP::TaggedComponent component; component.tag = SSLIOP::TAG_SSL_SEC_TRANS; @@ -262,12 +259,8 @@ TAO_SSLIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key, { ssliop_profile->tagged_components ().set_orb_type (TAO_ORB_TYPE); - CONV_FRAME::CodeSetComponentInfo code_set_info; - code_set_info.ForCharData.native_code_set = - TAO_DEFAULT_CHAR_CODESET_ID; - code_set_info.ForWcharData.native_code_set = - TAO_DEFAULT_WCHAR_CODESET_ID; - ssliop_profile->tagged_components ().set_code_sets (code_set_info); + this->orb_core_->codeset_manager()-> + set_codeset(ssliop_profile->tagged_components()); IOP::TaggedComponent component; component.tag = SSLIOP::TAG_SSL_SEC_TRANS; |