*** empty log message ***

1 files changed, 26 insertions, 21 deletions

diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index e87b624752e..2e48ec4e8e7 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -105,36 +105,41 @@ TAO_SHMIOP_Transport::recv_i (char *buf,
                               size_t len,
                               const ACE_Time_Value *max_wait_time)
 {
-  ssize_t n = this->connection_handler_->peer ().recv (buf,
-                                                       len,
-                                                       max_wait_time);
-
-  // Most of the errors handling is common for
-  // Now the message has been read
-  if (n == -1 &&
-      TAO_debug_level > 4 &&
-      errno != ETIME)
+  ssize_t n = 0;
+
+  int read_break = 0;
+
+  while (!read_break)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - %p \n"),
-                  ACE_TEXT ("TAO - read message failure ")
-                  ACE_TEXT ("recv_i () \n")));
+      n = this->connection_handler_->peer ().recv (buf,
+                                                   len,
+                                                   max_wait_time);
+
+      // If we get a EWOULBLOCK we try to read again.
+      if (n == -1 && (errno == EAGAIN || errno == EWOULDBLOCK))
+        {
+          n = 0;
+          continue;
+        }
+
+      // If there is anything else we just drop out of the loop.
+      read_break = 1;
     }
 
-  // Error handling
   if (n == -1)
     {
-      if (errno == EWOULDBLOCK)
-        return 0;
-
-      return -1;
+      if (TAO_debug_level > 3 && errno != ETIME)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("TAO (%P|%t) - %p \n"),
+                      ACE_TEXT ("TAO - read message failure ")
+                      ACE_TEXT ("recv_i () \n")));
+        }
     }
-  // @@ What are the other error handling here??
   else if (n == 0)
     {
-      return -1;
+      n = -1;
     }
-
   return n;
 }