diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-02-11 07:56:42 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-11 07:56:42 -0800 |
| commit | 5a4f991d5dc6f81b9e4c2efe3b6102bdd49d4186 (patch) | |
| tree | f7d2fcb863fa5334f0b4d0645e9a559c82cc5b95 /src/core/surface | |
| parent | 1e67aeed227f940c78c72c18d291f7abe3e110aa (diff) | |
| parent | 9a7926c979e9331fd50fb653cf62d3da313ddb87 (diff) | |
Merge github.com:grpc/grpc into c++api
Conflicts:
test/cpp/qps/server.cc
Diffstat (limited to 'src/core/surface')
| -rw-r--r-- | src/core/surface/call.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/surface/call.c b/src/core/surface/call.c index cc7094a0ce..b31f4f1931 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -1264,7 +1264,10 @@ grpc_call_error grpc_call_server_accept_old(grpc_call *call, ls = get_legacy_state(call); err = bind_cq(call, cq); - if (err != GRPC_CALL_OK) return err; + if (err != GRPC_CALL_OK) { + unlock(call); + return err; + } ls->finished_tag = finished_tag; |