diff options
| author |  Yang Gao <yangg@google.com> | 2016-04-05 21:33:45 +0000 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2016-04-05 21:33:45 +0000 |
| commit | db566d21292e089232663092f31bf27efa3d0391 (patch) | |
| tree | 62d6a97c4bd136629a6d423ee917b693d4731f30 /src/core/lib/channel/subchannel_call_holder.c | |
| parent | b49a1e5849529bdd769587dbd798edfabe516d5f (diff) | |
| parent | abb4f5f3ab911d0b0c5bc7d76c27592a1656bd12 (diff) | |
Merge branch 'master' into hpack_table
Diffstat (limited to 'src/core/lib/channel/subchannel_call_holder.c')
| -rw-r--r-- | src/core/lib/channel/subchannel_call_holder.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/lib/channel/subchannel_call_holder.c b/src/core/lib/channel/subchannel_call_holder.c index 22f3679bf5..a2686a380a 100644 --- a/src/core/lib/channel/subchannel_call_holder.c +++ b/src/core/lib/channel/subchannel_call_holder.c @@ -127,7 +127,7 @@ retry: break; case GRPC_SUBCHANNEL_CALL_HOLDER_PICKING_SUBCHANNEL: holder->pick_subchannel(exec_ctx, holder->pick_subchannel_arg, NULL, - &holder->connected_subchannel, NULL); + 0, &holder->connected_subchannel, NULL); break; } gpr_mu_unlock(&holder->mu); @@ -145,7 +145,8 @@ retry: GRPC_CALL_STACK_REF(holder->owning_call, "pick_subchannel"); if (holder->pick_subchannel( exec_ctx, holder->pick_subchannel_arg, op->send_initial_metadata, - &holder->connected_subchannel, &holder->next_step)) { + op->send_initial_metadata_flags, &holder->connected_subchannel, + &holder->next_step)) { holder->creation_phase = GRPC_SUBCHANNEL_CALL_HOLDER_NOT_CREATING; GRPC_CALL_STACK_UNREF(exec_ctx, holder->owning_call, "pick_subchannel"); } |