aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib/surface/server.c
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-01-26 12:21:28 -0800
committerGravatar Craig Tiller <ctiller@google.com>2017-01-26 12:21:28 -0800
commitafceb2edbd909757d6e6c0f3d1d25b8d50893220 (patch)
tree8d374dc86ddafa272536ec98b71fe07f7b33213d /src/core/lib/surface/server.c
parent8b7372b1eefbd84d6c62aae27f219e0ea8c55a87 (diff)
parent4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae (diff)
Merge github.com:grpc/grpc into rollfwd
Diffstat (limited to 'src/core/lib/surface/server.c')
-rw-r--r--src/core/lib/surface/server.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/lib/surface/server.c b/src/core/lib/surface/server.c
index 3782b49122..6ab1c0d94d 100644
--- a/src/core/lib/surface/server.c
+++ b/src/core/lib/surface/server.c
@@ -600,7 +600,7 @@ static void finish_start_new_rpc(
grpc_op op;
memset(&op, 0, sizeof(op));
op.op = GRPC_OP_RECV_MESSAGE;
- op.data.recv_message = &calld->payload;
+ op.data.recv_message.recv_message = &calld->payload;
grpc_closure_init(&calld->publish, publish_new_rpc, elem,
grpc_schedule_on_exec_ctx);
grpc_call_start_batch_and_execute(exec_ctx, calld->call, &op, 1,
@@ -849,7 +849,8 @@ static void accept_stream(grpc_exec_ctx *exec_ctx, void *cd,
grpc_op op;
memset(&op, 0, sizeof(op));
op.op = GRPC_OP_RECV_INITIAL_METADATA;
- op.data.recv_initial_metadata = &calld->initial_metadata;
+ op.data.recv_initial_metadata.recv_initial_metadata =
+ &calld->initial_metadata;
grpc_closure_init(&calld->got_initial_metadata, got_initial_metadata, elem,
grpc_schedule_on_exec_ctx);
grpc_call_start_batch_and_execute(exec_ctx, call, &op, 1,