diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2007-01-05 00:58:17 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2007-01-05 00:58:17 +0000 |
| commit | 6e82a1e15b10ce5903c90cd09c688f7fef210bdd (patch) | |
| tree | 8637d3b681f5db59816758c22e8648b81208d9d0 | |
| parent | 9471a8665e117c640cd7fa1f2d4a6c0f12ace183 (diff) | |
| download | ATCD-6e82a1e15b10ce5903c90cd09c688f7fef210bdd.tar.gz | |
Fri Jan 5 00:53:34 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/tao/Strategies/UIOP_Connector.cpp | 9 | ||||
| -rw-r--r-- | TAO/tao/Transport_Connector.cpp | 5 |
3 files changed, 12 insertions, 14 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index af54005abb3..2c43cc587da 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Fri Jan 5 00:53:34 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/Transport_Connector.cpp: + * tao/Strategies/UIOP_Connector.cpp: + + Removed the warning generated if a trailing '/' was not present + if the default object key were desired. The '/' separator is + required only when an explicit object key is present. See + section 13.6.10.1 of CORBA 3.0.3 specification (formal/04-03-01) + to note that the slash is part of the object key portion of the + corbaloc string. + Thu Jan 4 20:10:38 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com> This is in addition to the change from "Thu Jan 4 04:11:02 UTC diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index 6a3630adae1..5a9ded4d3c7 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -94,15 +94,6 @@ TAO_UIOP_Connector::corbaloc_scan (const char *str, size_t &len str)); return 0; } - if (*(separator+1) != ',' && *(separator+1) != '/') - { - if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) TAO_UIOP_CONNECTOR::corbaloc_scan warning: " - "terminating charactor '|' should be followed by a ','" - "or a '/' in <%s>", - str)); - } len = (separator - str) + 1; return this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index 9047a30bf1b..1fd2461becb 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -94,11 +94,6 @@ TAO_Connector::corbaloc_scan (const char *str, const char *slash_pos = ACE_OS::strchr (str,'/'); if (comma_pos == 0 && slash_pos == 0) { - if (TAO_debug_level) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("TAO (%P|%t) TAO_Connector::corbaloc_scan warning: ") - ACE_TEXT("supplied string contains no comma or slash: %s\n"), - str)); len = ACE_OS::strlen (str); } else if (comma_pos == 0 || comma_pos > slash_pos) |