diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-01 09:28:24 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-01 09:28:24 -0700 |
| commit | 555cf763a3f939639e03ef9e1f2a67bc5dfe2a19 (patch) | |
| tree | b1a9d437e14a827dd97467d7fd52a55e0464a9b9 /src/core | |
| parent | 89119fa9b63882090ce925a98eeb6e4b5cb1757e (diff) | |
| parent | d4c0f550b0662d2ec2bc0deb7985aa1357c195a7 (diff) | |
Merge branch 'client_channel_cleanup' into deadline_filter
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ext/client_config/client_channel.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/ext/client_config/client_channel.c b/src/core/ext/client_config/client_channel.c index fff80abb80..61e012578e 100644 --- a/src/core/ext/client_config/client_channel.c +++ b/src/core/ext/client_config/client_channel.c @@ -652,8 +652,8 @@ retry: fail_locked(exec_ctx, calld, GRPC_ERROR_REF(op->cancel_error)); break; case GRPC_SUBCHANNEL_CALL_HOLDER_PICKING_SUBCHANNEL: - pick_subchannel(exec_ctx, elem, NULL, 0, - &calld->connected_subchannel, NULL); + pick_subchannel(exec_ctx, elem, NULL, 0, &calld->connected_subchannel, + NULL); break; } gpr_mu_unlock(&calld->mu); @@ -670,10 +670,9 @@ retry: calld->creation_phase = GRPC_SUBCHANNEL_CALL_HOLDER_PICKING_SUBCHANNEL; grpc_closure_init(&calld->next_step, subchannel_ready, calld); GRPC_CALL_STACK_REF(calld->owning_call, "pick_subchannel"); - if (pick_subchannel( - exec_ctx, elem, op->send_initial_metadata, - op->send_initial_metadata_flags, &calld->connected_subchannel, - &calld->next_step)) { + if (pick_subchannel(exec_ctx, elem, op->send_initial_metadata, + op->send_initial_metadata_flags, + &calld->connected_subchannel, &calld->next_step)) { calld->creation_phase = GRPC_SUBCHANNEL_CALL_HOLDER_NOT_CREATING; GRPC_CALL_STACK_UNREF(exec_ctx, calld->owning_call, "pick_subchannel"); } |