summaryrefslogtreecommitdiff
path: root/ACE/ace/Cached_Connect_Strategy_T.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2015-09-16 08:55:38 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2015-09-16 08:55:38 +0200
commit8b0ee3b9d25f29c23bb13919865d6b8266faa5d2 (patch)
treec5ab900b9ea5e45634b45285d4d42cf2a2dbae65 /ACE/ace/Cached_Connect_Strategy_T.cpp
parent605d00acaefdf2a7f2bd97328d7e6a12262156c2 (diff)
downloadATCD-8b0ee3b9d25f29c23bb13919865d6b8266faa5d2.tar.gz
Revert "Fix connecting timeout without returning -1 in ACE_Cached_Connect_Strategy_T"
Diffstat (limited to 'ACE/ace/Cached_Connect_Strategy_T.cpp')
-rw-r--r--ACE/ace/Cached_Connect_Strategy_T.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp
index aec3a1e42d8..7af66260693 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.cpp
+++ b/ACE/ace/Cached_Connect_Strategy_T.cpp
@@ -271,10 +271,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE
// connect().
if (errno == EWOULDBLOCK || errno == ETIMEDOUT)
- {
- errno = ENOTSUP;
- return -1;
- }
+ errno = ENOTSUP;
else if (ACE::out_of_handles (errno) || errno == EADDRINUSE)
{
// If the connect failed due to the process running out of