ChangeLogTag:Fri Aug 27 19:17:11 UTC 2010 Steve Huston <shuston@riverace.com>

1 files changed, 1 insertions, 28 deletions

diff --git a/ACE/ace/SOCK_IO.cpp b/ACE/ace/SOCK_IO.cpp
index 41897e680de..b9175e7d621 100644
--- a/ACE/ace/SOCK_IO.cpp
+++ b/ACE/ace/SOCK_IO.cpp
@@ -2,8 +2,6 @@
 
 #include "ace/SOCK_IO.h"
 
-#include "ace/Handle_Set.h"
-#include "ace/OS_NS_sys_select.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/OS_Memory.h"
 #include "ace/Truncate.h"
@@ -37,35 +35,10 @@ ACE_SOCK_IO::recvv (iovec *io_vec,
 {
   ACE_TRACE ("ACE_SOCK_IO::recvv");
 #if defined (FIONREAD)
-  ACE_Handle_Set handle_set;
-  handle_set.reset ();
-  handle_set.set_bit (this->get_handle ());
-
   io_vec->iov_base = 0;
-
-  // Check the status of the current socket.
-#  if defined (ACE_WIN32)
-  // This arg is ignored on Windows and causes pointer truncation
-  // warnings on 64-bit compiles.
-  int select_width = 0;
-#  else
-  int select_width = int (this->get_handle ()) + 1;
-#  endif /* ACE_WIN32 */
-  switch (ACE_OS::select (select_width,
-                          handle_set,
-                          0, 0,
-                          timeout))
+  if( ACE::handle_read_ready (this->get_handle (), timeout) != 1 )
     {
-    case -1:
-      return -1;
-      /* NOTREACHED */
-    case 0:
-      errno = ETIME;
       return -1;
-      /* NOTREACHED */
-    default:
-      // Goes fine, fallthrough to get data
-      break;
     }
 
   int inlen = 0;