diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-06-11 09:50:56 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-06-11 09:50:56 -0700 |
| commit | 173761fbd56eefebaf63f5d0b35f44f244b0148b (patch) | |
| tree | 6d38a7ea15024999b0716dfa724299c0efe1ac9b /src/core | |
| parent | 841962a961cea0dbb07ae638b24c75226b4e61e1 (diff) | |
| parent | 5e84be56dbec81fbd9f654943378aa15dba49c1e (diff) | |
Merge branch 'you-complete-me' into we-dont-need-no-backup
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/surface/server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 525fe2e103..3671efe0d0 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -1010,7 +1010,7 @@ void grpc_server_destroy(grpc_server *server) { listener *l; gpr_mu_lock(&server->mu); - GPR_ASSERT(server->shutdown); + GPR_ASSERT(server->shutdown || !server->listeners); GPR_ASSERT(server->listeners_destroyed == num_listeners(server)); while (server->listeners) { |