diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-24 00:49:56 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-24 00:49:56 +0000 |
| commit | 19b57c822641f1d61a8ba38e7a3aba249185be7f (patch) | |
| tree | c444e909c531f8179620ebbf71504c99bc2c4678 /TAO | |
| parent | 191fc424736509c47e96848c8755a7f961e43915 (diff) | |
| download | ATCD-19b57c822641f1d61a8ba38e7a3aba249185be7f.tar.gz | |
Wed Jan 23 16:40:21 2002 Jaiganesh Balasubramanian <jai@kelvar.ece.uci.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 12 |
2 files changed, 18 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 29707953047..c841e21047a 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Wed Jan 23 16:40:21 2002 Jaiganesh Balasubramanian <jai@kelvar.ece.uci.edu> + + * tao/ORB.cpp: + Made changes to get the correct port value to search the NameService + when the ORBDefaultInitRef option is used. + The changes are made thanks to Andrew L. Shwaika<als@solvo.ru> + Wed Jan 23 14:16:35 2002 Carlos O'Ryan <coryan@uci.edu> * TAO_IDL/include/ast_argument.h: diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index f0d8de2b0ac..fcf04633cc5 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1034,7 +1034,17 @@ CORBA_ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id ACE_OS::strcat (def_init_ref, port_ptr.in ()); ACE_OS::strcat (def_init_ref, "::"); - this->orb_core_->orb_params ()->default_init_ref (def_init_ref.in ()); + CORBA::String_var default_init_ref = + this->orb_core_->orb_params ()->default_init_ref (); + + static const char mcast_prefix[] = "mcast://:::"; + + if ((ACE_OS::strncmp (default_init_ref.in (), + mcast_prefix, + sizeof mcast_prefix -1) == 0)) + { + this->orb_core_->orb_params ()->default_init_ref (def_init_ref.in ()); + } return CORBA::Object::_nil (); } |