diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-11-29 12:40:40 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-11-29 12:40:40 +0000 |
| commit | b6b5209ef0c49f97273937132b6188c0ced1cb38 (patch) | |
| tree | bdd2ff547347715cf83bd362496282c555afc5dd | |
| parent | 8da43d0a5f9d113de94797fb372171b4540535bf (diff) | |
| download | ATCD-b6b5209ef0c49f97273937132b6188c0ced1cb38.tar.gz | |
ChangeLogTag:Mon Nov 29 12:39:13 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Endpoint.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Endpoint.cpp | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 11ec5c21cf1..05fe1e078e1 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Nov 29 12:39:13 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/IIOP_Endpoint.cpp: + * tao/Strategies/SCIOP_Endpoint.cpp: + + Fixed a stupid typo which resulted in some tests failing in the + daily builds. Thanks to Johnny for pointing me to the builds. + Mon Nov 29 10:00:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp: diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index 0b9b6a91138..e8efe14d63f 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -295,7 +295,7 @@ TAO_IIOP_Endpoint::preferred_interfaces (TAO_ORB_Core *oc) } } - if (tmp.c_str () != 0 && + if (tmp.length () != 0 && !oc->orb_params ()->enforce_pref_interfaces ()) { TAO_Endpoint *tmp_ep = latest->duplicate (); diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp index 59bb220fd9e..3af168fbcd5 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp @@ -278,10 +278,6 @@ TAO_SCIOP_Endpoint::preferred_interfaces (TAO_ORB_Core *oc) while (pos != ACE_CString::npos) { - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Pos value is [%d] \n", - pos)); - // Do we have a "," or an '\0'? ssize_t new_pos = tmp.find (",", pos + 1); @@ -329,7 +325,7 @@ TAO_SCIOP_Endpoint::preferred_interfaces (TAO_ORB_Core *oc) } } - if (tmp.c_str () != 0 && + if (tmp.length () != 0 && !oc->orb_params ()->enforce_pref_interfaces ()) { TAO_Endpoint *tmp_ep = latest->duplicate (); |