summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2003-08-14 18:03:14 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2003-08-14 18:03:14 +0000
commitd744743562dd21733b9588a47e0686ce585c2c32 (patch)
tree604c66438113ebb93e7e31dc867bb39a07cb468a /ace
parentf5bf4e21dde84a04b827123ed753c3ca4278968b (diff)
downloadATCD-d744743562dd21733b9588a47e0686ce585c2c32.tar.gz
ChangeLogTag:Thu Aug 14 10:56:57 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'ace')
-rw-r--r--ace/SSL/SSL_SOCK_Acceptor.cpp4
-rw-r--r--ace/SSL/SSL_SOCK_Connector.cpp5
2 files changed, 2 insertions, 7 deletions
diff --git a/ace/SSL/SSL_SOCK_Acceptor.cpp b/ace/SSL/SSL_SOCK_Acceptor.cpp
index 0567af14d5a..92b6ab7da76 100644
--- a/ace/SSL/SSL_SOCK_Acceptor.cpp
+++ b/ace/SSL/SSL_SOCK_Acceptor.cpp
@@ -60,10 +60,6 @@ ACE_SSL_SOCK_Acceptor::ssl_accept (ACE_SSL_SOCK_Stream &new_stream,
return -1;
}
- // Block indefinitely if timeout == ACE_Time_Value::zero.
- if (timeout != 0 && *timeout == ACE_Time_Value::zero)
- timeout = 0;
-
// Take into account the time between each select() call below.
ACE_Countdown_Time countdown (timeout);
diff --git a/ace/SSL/SSL_SOCK_Connector.cpp b/ace/SSL/SSL_SOCK_Connector.cpp
index 07d98071757..0664ea387f9 100644
--- a/ace/SSL/SSL_SOCK_Connector.cpp
+++ b/ace/SSL/SSL_SOCK_Connector.cpp
@@ -143,13 +143,12 @@ ACE_SSL_SOCK_Connector::ssl_connect (ACE_SSL_SOCK_Stream &new_stream,
// Must have at least one handle to wait for at this point.
ACE_ASSERT (rd_handle.num_set () == 1 || wr_handle.num_set () == 1);
- // Block indefinitely if timeout value is
- // ACE_Time_Value::zero.
+ // Block indefinitely if timeout pointer is zero.
status = ACE::select (int (handle) + 1,
&rd_handle,
&wr_handle,
0,
- (t == ACE_Time_Value::zero ? 0 : &t));
+ (timeout == 0 ? 0 : &t));
(void) countdown.update ();