diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-31 14:19:16 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-31 14:19:16 -0700 |
| commit | 6af3f39b0c93f88f5032ac04d22f699c6f883f45 (patch) | |
| tree | e0095335db20a56de64302d5c0cfebf7de5ab1a7 /src/core | |
| parent | 755d6dfb2c675ce1084dcf2287d768714782e0f7 (diff) | |
| parent | 85c2a08ca6e008589f660113de5d8d3b7df74b85 (diff) | |
Merge branch 'plucking-hell' into primary-goat-whisperer
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/iomgr/pollset_multipoller_with_poll_posix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c index 1249b1b64a..b5b2d7534d 100644 --- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c +++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c @@ -119,7 +119,7 @@ static void multipoll_with_poll_pollset_maybe_work( pfds[0].revents = POLLOUT; for (i = 0; i < h->fd_count; i++) { int remove = grpc_fd_is_orphaned(h->fds[i]); - for (j = 0; j < h->del_count; j++) { + for (j = 0; !remove && j < h->del_count; j++) { if (h->fds[i] == h->dels[j]) remove = 1; } if (remove) { |