diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2007-01-03 22:29:45 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2007-01-03 22:29:45 +0000 |
| commit | d0ea0eddf73a559b1fdcf722b5c408cdb9b95b9b (patch) | |
| tree | aaa4101dca7f2801e5660fb4d37836cc5499a73b | |
| parent | bbb5a245a6d813c9a423d7b088bf7829196587d2 (diff) | |
| download | ATCD-d0ea0eddf73a559b1fdcf722b5c408cdb9b95b9b.tar.gz | |
Wed Jan 3 22:23:57 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 16 | ||||
| -rw-r--r-- | TAO/tao/Profile_Transport_Resolver.cpp | 11 | ||||
| -rw-r--r-- | TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp | 2 |
3 files changed, 21 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 73057095cb5..251734d2932 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,7 +1,21 @@ +Wed Jan 3 22:23:57 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/Profile_Transport_Resolver.cpp: + + Corrected the return value for find_transport. The comment in + the method wasn't very clear and so when the new safe transport + pointer code was added, the return value for success and failure + were inadvertently altered, which broke the optimized connection + strategy's endpoint selector + + * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp: + + Fixed the name used in the ACE_RCSID tag. + Wed Jan 3 19:53:43 UTC 2007 Chris Cleeland <cleeland_c@ociweb.com> * tao/tests/Bug_2702_Regression/server_on_localhost_1192.ior: - + Added this file, which was somehow missed during the merge. This should address test failures across all platforms. diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index f3beae91869..0a6026f543c 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -269,18 +269,17 @@ namespace TAO TAO::Transport_Cache_Manager & cache = this->profile_->orb_core()->lane_resources ().transport_cache(); - // the cache increments the reference count on the transport if the - // find is successful. Find_transport uses negative logic in its return, - // 0 for success + // the cache increments the reference count on the transport if + // the find is successful. Cache.find_transport returns 0 on success. + // but we want to return a "boolean" of 0 for failure, 1 for success. TAO_Transport* tmp = this->transport_.get (); if (cache.find_transport(desc, tmp) != 0) - return -1; + return 0; this->transport_.set (tmp); - return 0; + return 1; } - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp index ad864ad1b9f..5b0938be1df 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp @@ -12,7 +12,7 @@ #include "tao/Profile_Transport_Resolver.h" ACE_RCSID (tao, - Invocation_Endpoint_Selectors, + Optimized_Connection_Endpoint_Selector, "$Id$") TAO_BEGIN_VERSIONED_NAMESPACE_DECL |