diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-05-08 17:08:19 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-05-08 17:08:19 +0000 |
| commit | 8236ed75a7b901c7eb12921d266079b38d279700 (patch) | |
| tree | 8dd80e1a576389adc81a90976d932fb886687970 | |
| parent | 51069f785181c3e60992d3cc3ac08081b89a7252 (diff) | |
| download | ATCD-8236ed75a7b901c7eb12921d266079b38d279700.tar.gz | |
ChangeLogTag: Tue May 8 10:06:58 2001 Priyanka Gontla <pgontla@ece.uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/tao/CORBALOC_Parser.cpp | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 588ea234847..b5f10da1458 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Tue May 8 10:06:58 2001 Priyanka Gontla <pgontla@ece.uci.edu> + + * tao/CORBALOC_Parser.cpp (parse_string): + Removed a debug statement that missed the final cleanup before + the commit. + Tue May 8 09:42:02 2001 Priyanka Gontla <pgontla@ece.uci.edu> * tao/CORBALOC_Parser.cpp (check_prefix): diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 0c1502292f7..f65121bf115 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -375,19 +375,19 @@ TAO_CORBALOC_Parser::check_prefix (const char *end_point, size_t len0 = ACE_OS::strlen (protocol[0]); // Lets first check if it is a valid protocol: - if (colon_slot != 0 && + if (colon_slot != 0 && !((ACE_OS::strncmp (end_point, iiop_prefix, sizeof iiop_prefix - 1) == 0) || - + (ACE_OS::strncmp (end_point, shmiop_prefix, sizeof shmiop_prefix - 1) == 0) || - + (ACE_OS::strncmp (end_point, uiop_prefix, sizeof uiop_prefix - 1) == 0) || - + (ACE_OS::strncmp (end_point, rir_prefix, sizeof rir_prefix - 1) == 0))) @@ -396,7 +396,7 @@ TAO_CORBALOC_Parser::check_prefix (const char *end_point, ACE_TEXT ("TAO (%P|%t) ") ACE_TEXT ("no usable transport protocol ") ACE_TEXT ("was found.\n"))); - + ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_OMG_VMCID | 10, CORBA::COMPLETED_NO), -1); @@ -419,8 +419,6 @@ TAO_CORBALOC_Parser::parse_string (const char *ior, { /// MProfile which consists of the profiles for each endpoint. TAO_MProfile mprofile; - - cout << __FILE__ << __LINE__ << endl; // Skip the prefix. We know it is there because this method is only // called if match_prefix() returns 1. |