diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-11-16 19:31:28 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-11-16 19:31:28 -0800 |
| commit | 177039b2f89e73ad0d048da021f939f3a153c4e2 (patch) | |
| tree | c7f10f04cd9a0872863e2b181162bc9928160cd8 /src/core/lib/iomgr/call_combiner.cc | |
| parent | 995aa91bbbc68deb6dfd7c667cfee3af2bedec08 (diff) | |
| parent | 82c8f945302f128495e261b853ac49f1dfbe69a1 (diff) | |
Merge master
Diffstat (limited to 'src/core/lib/iomgr/call_combiner.cc')
| -rw-r--r-- | src/core/lib/iomgr/call_combiner.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index c2f5b4bb84..32b4244748 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -119,7 +119,7 @@ void grpc_call_combiner_stop(grpc_call_combiner* call_combiner DEBUG_ARGS, bool empty; grpc_closure* closure = (grpc_closure*)gpr_mpscq_pop_and_check_end( &call_combiner->queue, &empty); - if (closure == NULL) { + if (closure == nullptr) { // This can happen either due to a race condition within the mpscq // code or because of a race with grpc_call_combiner_start(). if (GRPC_TRACER_ON(grpc_call_combiner_trace)) { |