diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-09-15 07:09:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 07:09:03 -0700 |
| commit | f254ddc7616e281b59b6e68f8ad0020bf682ed0b (patch) | |
| tree | dae353e621189ec7570b83938e2889c572f1b326 | |
| parent | 89b01a815ea4eadcb4a8d609c9a449ccfd9cdcea (diff) | |
| parent | 0e6242f7e2c1181d486ae8f86592619738574dd3 (diff) | |
| download | system_core-f254ddc7616e281b59b6e68f8ad0020bf682ed0b.zip system_core-f254ddc7616e281b59b6e68f8ad0020bf682ed0b.tar.gz system_core-f254ddc7616e281b59b6e68f8ad0020bf682ed0b.tar.bz2 | |
am 0e6242f7: am 40c2b7cb: Merge "Add missing lock in SocketListener." into gingerbread
Merge commit '0e6242f7e2c1181d486ae8f86592619738574dd3'
* commit '0e6242f7e2c1181d486ae8f86592619738574dd3':
Add missing lock in SocketListener.
| -rw-r--r-- | libsysutils/src/SocketListener.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ void SocketListener::runListener() { pthread_mutex_unlock(&mClientsLock); } FD_CLR(fd, &read_fds); + pthread_mutex_lock(&mClientsLock); continue; } } |