commit f254ddc7616e281b59b6e68f8ad0020bf682ed0b
author Brad Fitzpatrick <bradfitz@android.com> Wed Sep 15 07:09:03 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 15 07:09:03 2010 -0700
tree dae353e621189ec7570b83938e2889c572f1b326
parent 89b01a815ea4eadcb4a8d609c9a449ccfd9cdcea
parent 0e6242f7e2c1181d486ae8f86592619738574dd3

am 0e6242f7: am 40c2b7cb: Merge "Add missing lock in SocketListener." into gingerbread

Merge commit '0e6242f7e2c1181d486ae8f86592619738574dd3'

* commit '0e6242f7e2c1181d486ae8f86592619738574dd3':
  Add missing lock in SocketListener.

libsysutils/src/SocketListener.cpp

diff --git a/libsysutils/src/SocketListener.cpp b/libsysutils/src/SocketListener.cpp
index 7af221f..1bc06db 100644
--- a/libsysutils/src/SocketListener.cpp
+++ b/libsysutils/src/SocketListener.cpp
@@ -198,6 +198,7 @@
                         pthread_mutex_unlock(&mClientsLock);
                     }
                     FD_CLR(fd, &read_fds);
+                    pthread_mutex_lock(&mClientsLock);
                     continue;
                 }
             }