diff options
| author | pgontla <pgontla@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-12-27 19:56:53 +0000 |
|---|---|---|
| committer | pgontla <pgontla@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-12-27 19:56:53 +0000 |
| commit | 89f2c1481e912ca6fd75b0e280e06fb3628b3be4 (patch) | |
| tree | c31f0057362292f8583a7c8e4a154ec3ca02393d | |
| parent | 8928d9063b045a83757c26365a1e8fef8433a4a1 (diff) | |
| download | ATCD-89f2c1481e912ca6fd75b0e280e06fb3628b3be4.tar.gz | |
ChangeLogTag: Fri Dec 27 11:49:22 2002 Priyanka Gontla <pgontla@ece.uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/tao/CORBALOC_Parser.cpp | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7bf26247d79..d87a6a05a70 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Fri Dec 27 11:49:22 2002 Priyanka Gontla <pgontla@ece.uci.edu> + + * tao/CORBALOC_Parser.h: + * tao/CORBALOC_Parser.cpp: + Modified the signature of parse_string_assign_helper. We dont + have to send the length of original string as an argument. + When invoking assign_ke_string, the length of the token needs + to be sent as opposed to the length of the whole address. + Thanks to Bertin Colpron <BColpron@interstarinc.com> + for pointing out. + Fri Dec 27 14:57:50 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * examples/Makefile: diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index abb8ac5b806..68e4e23f8b6 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -210,7 +210,6 @@ TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr, void TAO_CORBALOC_Parser::parse_string_assign_helper ( - CORBA::ULong &addr_list_length, ACE_CString &key_string, ACE_CString &cloc_name, CORBA::ORB_ptr orb, @@ -228,12 +227,14 @@ TAO_CORBALOC_Parser::parse_string_assign_helper ( ",", &last_addr); + CORBA::ULong length; while (cloc_name_ptr != 0) { + length = ACE_OS::strlen (cloc_name_ptr); // Forms the endpoint and calls the mprofile_helper. this->assign_key_string (cloc_name_ptr, key_string, - addr_list_length, + length, orb, mprofile ACE_ENV_ARG_PARAMETER); @@ -457,8 +458,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior, // Get each endpoint: For each endpoint, make a MProfile and add // it to the main MProfile whose reference is passed to the // application - this->parse_string_assign_helper (addr_list_length, - key_string, + this->parse_string_assign_helper (key_string, cloc_name, orb, mprofile |