diff options
| author | Steve Huston <shuston@riverace.com> | 2012-09-05 22:16:38 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2012-09-05 22:16:38 +0000 |
| commit | d162b9d81e022b2abb9f31e0802ad9dd95b6925e (patch) | |
| tree | 72bd8b416f09c9526474786c9c7b305154643b69 | |
| parent | 9ce25817e8aab10fe21b7e7396c0644fded1dffb (diff) | |
| download | ATCD-d162b9d81e022b2abb9f31e0802ad9dd95b6925e.tar.gz | |
ChangeLogTag:Wed Sep 5 20:09:09 UTC 2012 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ace/SSL/SSL_SOCK_Stream.cpp | 52 |
1 files changed, 6 insertions, 46 deletions
diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.cpp b/ACE/ace/SSL/SSL_SOCK_Stream.cpp index d5e2a51e3a4..4bccbb833a5 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Stream.cpp @@ -409,22 +409,9 @@ ACE_SSL_SOCK_Stream::recv_n (void *buf, timeout); if (n < 0) - { - if (errno == EWOULDBLOCK) - { - // If blocked, try again. - n = 0; - continue; - } - else - { - return -1; - } - } + return -1; else if (n == 0) - { - break; - } + break; } return ACE_Utils::truncate_cast<ssize_t> (bytes_transferred); @@ -455,22 +442,9 @@ ACE_SSL_SOCK_Stream::recv_n (void *buf, int len, int flags) const flags); if (n < 0) - { - if (errno == EWOULDBLOCK) - { - // If blocked, try again. - n = 0; - continue; - } - else - { - return -1; - } - } + return -1; else if (n == 0) - { - break; - } + break; } return ACE_Utils::truncate_cast<ssize_t> (bytes_transferred); @@ -498,24 +472,10 @@ ACE_SSL_SOCK_Stream::send_n (const void *buf, int len, int flags) const n = this->send ((const char*) buf + bytes_transferred, len - bytes_transferred, flags); - if (n < 0) - { - if (errno == EWOULDBLOCK) - { - // If blocked, try again. - n = 0; - continue; - } - else - { - return -1; - } - } + return -1; else if (n == 0) - { - break; - } + break; } return ACE_Utils::truncate_cast<ssize_t> (bytes_transferred); |