svn commit: r510180 - in /incubator/qpid/branches/qpid.0-9/cpp/lib: client/Connector.cpp common/sys/apr/Socket.cpp

[aconway]

Author: aconway
Date: Wed Feb 21 12:09:23 2007
New Revision: 510180

URL: http://svn.apache.org/viewvc?view=rev&rev=510180
Log:
Fix spurious error message printed by client when broker closes connection.

Modified:
    incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.cpp
    incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/Socket.cpp

Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.cpp?view=diff&rev=510180&r1=510179&r2=510180
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/client/Connector.cpp Wed Feb 21 
12:09:23 2007
@@ -113,14 +113,16 @@
 
 void Connector::checkIdle(ssize_t status){
     if(timeoutHandler){
-         Time t = now() * TIME_MSEC;
+        Time t = now() * TIME_MSEC;
         if(status == Socket::SOCKET_TIMEOUT) {
             if(idleIn && (t - lastIn > idleIn)){
                 timeoutHandler->idleIn();
             }
-        }else if(status == Socket::SOCKET_EOF){
+        }
+        else if(status == 0 || status == Socket::SOCKET_EOF) {
             handleClosed();
-        }else{
+        }
+        else {
             lastIn = t;
         }
         if(idleOut && (t - lastOut > idleOut)){

Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/Socket.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/Socket.cpp?view=diff&rev=510180&r1=510179&r2=510180
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/Socket.cpp 
(original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/Socket.cpp Wed Feb 
21 12:09:23 2007
@@ -75,9 +75,12 @@
     apr_size_t received = size;
     apr_status_t status =
         apr_socket_recv(socket, reinterpret_cast<char*>(data), &received);
-    if (APR_STATUS_IS_TIMEUP(status)) return SOCKET_TIMEOUT;
+    if (APR_STATUS_IS_TIMEUP(status))
+        return SOCKET_TIMEOUT;
+    if (APR_STATUS_IS_EOF(status))
+        return SOCKET_EOF;
     CHECK_APR_SUCCESS(status);
-     return received;
+    return received;
 }