From 30e7b02b5c8bc55c109ed84dfa30663ce90e134b Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Fri, 7 Sep 2018 17:02:57 -0700 Subject: [PATCH] Also initialize closures again --- src/core/ext/filters/http/client/http_client_filter.cc | 3 +++ src/core/ext/filters/http/server/http_server_filter.cc | 3 +++ src/core/ext/filters/message_size/message_size_filter.cc | 3 +++ src/core/lib/security/transport/server_auth_filter.cc | 3 +++ 4 files changed, 12 insertions(+) diff --git a/src/core/ext/filters/http/client/http_client_filter.cc b/src/core/ext/filters/http/client/http_client_filter.cc index c7d7f333a5b..e4030afcb45 100644 --- a/src/core/ext/filters/http/client/http_client_filter.cc +++ b/src/core/ext/filters/http/client/http_client_filter.cc @@ -175,6 +175,9 @@ static void recv_trailing_metadata_ready(void* user_data, grpc_error* error) { if (calld->original_recv_initial_metadata_ready != nullptr) { calld->recv_trailing_metadata_err = GRPC_ERROR_REF(error); calld->seen_recv_trailing_metadata_ready = true; + GRPC_CLOSURE_INIT(&calld->recv_trailing_metadata_ready, + recv_trailing_metadata_ready, elem, + grpc_schedule_on_exec_ctx); GRPC_CALL_COMBINER_STOP(calld->call_combiner, "wait for initial metadata"); return; } diff --git a/src/core/ext/filters/http/server/http_server_filter.cc b/src/core/ext/filters/http/server/http_server_filter.cc index 484ce9c22f3..90336103cfa 100644 --- a/src/core/ext/filters/http/server/http_server_filter.cc +++ b/src/core/ext/filters/http/server/http_server_filter.cc @@ -335,6 +335,9 @@ static void hs_recv_trailing_metadata_ready(void* user_data, grpc_error* err) { if (calld->original_recv_initial_metadata_ready) { calld->recv_trailing_metadata_ready_error = GRPC_ERROR_REF(err); calld->seen_recv_trailing_metadata_ready = true; + GRPC_CLOSURE_INIT(&calld->recv_trailing_metadata_ready, + hs_recv_trailing_metadata_ready, elem, + grpc_schedule_on_exec_ctx); GRPC_CALL_COMBINER_STOP(calld->call_combiner, "wait for initial metadata"); return; } diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc index 01d483f45e7..d85c299abe8 100644 --- a/src/core/ext/filters/message_size/message_size_filter.cc +++ b/src/core/ext/filters/message_size/message_size_filter.cc @@ -167,6 +167,9 @@ static void recv_trailing_metadata_ready(void* user_data, grpc_error* error) { if (calld->next_recv_message_ready) { calld->seen_recv_trailing_metadata = true; calld->recv_trailing_metadata_error = GRPC_ERROR_REF(error); + GRPC_CLOSURE_INIT(&calld->recv_trailing_metadata_ready, + recv_trailing_metadata_ready, elem, + grpc_schedule_on_exec_ctx); GRPC_CALL_COMBINER_STOP(calld->call_combiner, "wait for recv message"); return; } diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc index 05dfd09ffb7..882f9859599 100644 --- a/src/core/lib/security/transport/server_auth_filter.cc +++ b/src/core/lib/security/transport/server_auth_filter.cc @@ -209,6 +209,9 @@ static void recv_trailing_metadata_ready(void* user_data, grpc_error* err) { if (calld->original_recv_initial_metadata_ready) { calld->recv_trailing_metadata_error = GRPC_ERROR_REF(err); calld->seen_recv_trailing_ready = true; + GRPC_CLOSURE_INIT(&calld->recv_trailing_metadata_ready, + recv_trailing_metadata_ready, elem, + grpc_schedule_on_exec_ctx); GRPC_CALL_COMBINER_STOP(calld->call_combiner, "wait for initial metadata"); } err = grpc_error_add_child(GRPC_ERROR_REF(err), GRPC_ERROR_REF(calld->error));