aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/surface/server.c
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-02-05 11:42:58 -0800
committerGravatar Craig Tiller <ctiller@google.com>2015-02-05 11:42:58 -0800
commit86d9159356d5d23981f122c3bd4ad912203666ca (patch)
tree1cf0b4622ada6275370277a748438102e44188f4 /src/core/surface/server.c
parent24fc2c4c5ddc56a678f17170ac4eec4ec570c780 (diff)
parent6b9afb153a82c921c7e80365a4e129c462c0ebad (diff)
Merge github.com:google/grpc into async-api-new
Diffstat (limited to 'src/core/surface/server.c')
-rw-r--r--src/core/surface/server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/surface/server.c b/src/core/surface/server.c
index d7e1dcd800..c0c524ad8d 100644
--- a/src/core/surface/server.c
+++ b/src/core/surface/server.c
@@ -265,7 +265,6 @@ static void stream_closed(grpc_call_element *elem) {
gpr_mu_lock(&chand->server->mu);
switch (calld->state) {
case ACTIVATED:
- grpc_call_stream_closed(elem);
break;
case PENDING:
call_list_remove(chand->server, calld, PENDING_START);
@@ -278,6 +277,7 @@ static void stream_closed(grpc_call_element *elem) {
break;
}
gpr_mu_unlock(&chand->server->mu);
+ grpc_call_stream_closed(elem);
}
static void read_closed(grpc_call_element *elem) {