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

* commit 'f819d0233646668b06de36a787979e3b180d6c48':
  libsysutils: SocketListener: handle recv errors more gracefully.
This commit is contained in:
Nick Kralevich 2011-04-27 09:40:04 -07:00 committed by Android Git Automerger
commit 18f6d964cb
1 changed files with 3 additions and 2 deletions

View File

@ -213,8 +213,9 @@ void SocketListener::runListener() {
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) {