Fix for leak on receiving eof on network

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@586345 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 7 deletions

diff --git a/cpp/src/qpid/sys/posix/AsynchIO.cpp b/cpp/src/qpid/sys/posix/AsynchIO.cpp
index c8babaf421..b2c50facd7 100644
--- a/cpp/src/qpid/sys/posix/AsynchIO.cpp
+++ b/cpp/src/qpid/sys/posix/AsynchIO.cpp
@@ -189,11 +189,7 @@ void AsynchIO::readable(DispatchHandle& h) {
             errno = 0;
             int readCount = buff->byteCount-buff->dataCount;
             int rc = h.getSocket().read(buff->bytes + buff->dataCount, readCount);
-            if (rc == 0) {
-                eofCallback(*this);
-                h.unwatchRead();
-                return;
-            } else if (rc > 0) {
+            if (rc > 0) {
                 buff->dataCount += rc;
                 readCallback(*this, buff);
                 if (rc != readCount) {
@@ -204,8 +200,8 @@ void AsynchIO::readable(DispatchHandle& h) {
                 // Put buffer back
                 bufferQueue.push_back(buff);
                 
-                // This is effectively the same as eof
-                if (errno == ECONNRESET) {
+                // Eof or other side has gone away
+                if (rc == 0 || errno == ECONNRESET) {
                     eofCallback(*this);
                     h.unwatchRead();
                     return;