diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-07 13:52:53 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-07 13:52:53 -0700 |
| commit | 547fed4e8b0b8e2390498b748ee49a033e5039ae (patch) | |
| tree | f8ed878185575bab8eccb606be76b0384f62cb28 /src/core/iomgr/pollset_posix.c | |
| parent | cf531785495330c86ce2531d2ec5dbff9da680c6 (diff) | |
| parent | 772187cdf0ff9dfafd2e693474c51eeddfe4c800 (diff) | |
Merge github.com:grpc/grpc into footprints-on-the-sands-of-time
Conflicts:
src/core/channel/client_setup.c
src/core/surface/init.c
Diffstat (limited to 'src/core/iomgr/pollset_posix.c')
| -rw-r--r-- | src/core/iomgr/pollset_posix.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 205b1f2dbb..85101764d2 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -250,7 +250,8 @@ static void basic_do_promote(void *args, int success) { pollset->in_flight_cbs--; if (pollset->shutting_down) { /* We don't care about this pollset anymore. */ - if (pollset->in_flight_cbs == 0 && pollset->counter == 0) { + if (pollset->in_flight_cbs == 0 && pollset->counter == 0 && !pollset->called_shutdown) { + pollset->called_shutdown = 1; do_shutdown_cb = 1; } } else if (grpc_fd_is_orphaned(fd)) { |