diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-09-14 10:46:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 10:46:35 -0700 |
| commit | 0e6242f7e2c1181d486ae8f86592619738574dd3 (patch) | |
| tree | 7d5e5e2522b85f1fb16d96af2b444e7c0a746511 | |
| parent | c3fa6149284058b30e3eea5010c16d3133711afb (diff) | |
| parent | 40c2b7cbedff612ce8bc7a51589a952cc1d047b6 (diff) | |
| download | system_core-0e6242f7e2c1181d486ae8f86592619738574dd3.zip system_core-0e6242f7e2c1181d486ae8f86592619738574dd3.tar.gz system_core-0e6242f7e2c1181d486ae8f86592619738574dd3.tar.bz2 | |
am 40c2b7cb: Merge "Add missing lock in SocketListener." into gingerbread
Merge commit '40c2b7cbedff612ce8bc7a51589a952cc1d047b6' into gingerbread-plus-aosp
* commit '40c2b7cbedff612ce8bc7a51589a952cc1d047b6':
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; } } |