commit f819d0233646668b06de36a787979e3b180d6c48
author Nick Kralevich <nnk@google.com> Wed Apr 27 09:22:38 2011 -0700
committer Android Code Review <code-review@android.com> Wed Apr 27 09:22:38 2011 -0700
tree 536b5c05ae62e99b85dda1f3f304b5e1f30da622
parent 2f7995ee0ff480b4ee06e8944e7d4569b59a5bad
parent 8795007a4aedb0860f6e7b838984ba8104f2febc

Merge "libsysutils: SocketListener: handle recv errors more gracefully."

libsysutils/src/SocketListener.cpp

diff --git a/libsysutils/src/SocketListener.cpp b/libsysutils/src/SocketListener.cpp
index 69ed79e..fcad624 100644
--- a/libsysutils/src/SocketListener.cpp
+++ b/libsysutils/src/SocketListener.cpp
@@ -213,8 +213,9 @@
             it = pendingList->begin();
             SocketClient* c = *it;
             pendingList->erase(it);
-            /* Process it, if false is returned, remove and destroy it */
-            if (!onDataAvailable(c)) {
+            /* Process it, if false is returned and our sockets are
+             * connection-based, remove and destroy it */
+            if (!onDataAvailable(c) && mListen) {
                 /* Remove the client from our array */
                 pthread_mutex_lock(&mClientsLock);
                 for (it = mClients->begin(); it != mClients->end(); ++it) {