diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2008-08-13 16:22:35 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2008-08-13 16:22:35 +0000 |
| commit | e3cd5b761684b2bde0f43d1b0aaecc464fd45560 (patch) | |
| tree | bb03ceab887d4478c873a19066fc4d5fef4437d3 /TAO | |
| parent | 241d0baf1c3eaa03c0c11256172e90eddc804678 (diff) | |
| download | ATCD-e3cd5b761684b2bde0f43d1b0aaecc464fd45560.tar.gz | |
ChangeLogTag: Wed Aug 13 16:21:34 UTC 2008 Adam Mitz <mitza@ociweb.com>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/Transport_Connector.cpp | 34 |
2 files changed, 23 insertions, 18 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2f2d8f2275d..f636f10995e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Aug 13 16:21:34 UTC 2008 Adam Mitz <mitza@ociweb.com> + + * tao/Transport_Connector.cpp (wait_for_transport): + + Combined the if/else branches for is_timeout and is_closed since both + cases need to remove the Transport from the cache. + Tue Aug 12 21:54:43 UTC 2008 Adam Mitz <mitza@ociweb.com> * tao/Transport_Connector.cpp (wait_for_transport): diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index 79073753b97..33abb9dd062 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -352,27 +352,25 @@ TAO_Connector::wait_for_transport (TAO::Profile_Transport_Resolver *r, ACE_Time_Value *timeout, bool force_wait) { - if (transport->connection_handler ()->is_timeout ()) + bool is_timeout = transport->connection_handler ()->is_timeout (); + if (is_timeout || transport->connection_handler()->is_closed ()) { if (TAO_debug_level > 2) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("TAO (%P|%t) - TAO_Connector::wait_for_transport, ") - ACE_TEXT("transport [%d], Connection Timed out.\n"), - transport->id () )); - } - - return false; - } - else if (transport->connection_handler()->is_closed ()) - { - if (TAO_debug_level > 2) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("TAO (%P|%t) - TAO_Connector::wait_for_transport, ") - ACE_TEXT("transport [%d], Connection failed. (%d)\n"), - transport->id (), - errno)); + if (is_timeout) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) - TAO_Connector::wait_for_transport, ") + ACE_TEXT ("transport [%d], Connection Timed out.\n"), + transport->id ())); + } + else + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) - TAO_Connector::wait_for_transport, ") + ACE_TEXT ("transport [%d], Connection failed. (%d)\n"), + transport->id (), errno)); + } } // purge from the connection cache. If we are not in the |