diff options
| author | Like Ma <likemartinma@gmail.com> | 2015-03-23 01:31:15 +0800 |
|---|---|---|
| committer | Like Ma <likemartinma@gmail.com> | 2015-03-23 01:31:15 +0800 |
| commit | c3bb78b8cd08ebf3b40521054c8f47a30d6fc000 (patch) | |
| tree | 1608d1768f2a09ecb896b71756931e1291ec6404 | |
| parent | 574ad9ec759a3d80a70f497878732591168cca2f (diff) | |
| download | ATCD-c3bb78b8cd08ebf3b40521054c8f47a30d6fc000.tar.gz | |
Fix connecting timeout without returning -1 in ACE_Cached_Connect_Strategy_T
| -rw-r--r-- | ACE/ace/Cached_Connect_Strategy_T.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp index 7af66260693..aec3a1e42d8 100644 --- a/ACE/ace/Cached_Connect_Strategy_T.cpp +++ b/ACE/ace/Cached_Connect_Strategy_T.cpp @@ -271,7 +271,10 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE // connect(). if (errno == EWOULDBLOCK || errno == ETIMEDOUT) - errno = ENOTSUP; + { + errno = ENOTSUP; + return -1; + } else if (ACE::out_of_handles (errno) || errno == EADDRINUSE) { // If the connect failed due to the process running out of |