diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-01-26 12:21:28 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-01-26 12:21:28 -0800 |
| commit | afceb2edbd909757d6e6c0f3d1d25b8d50893220 (patch) | |
| tree | 8d374dc86ddafa272536ec98b71fe07f7b33213d /src/node/ext | |
| parent | 8b7372b1eefbd84d6c62aae27f219e0ea8c55a87 (diff) | |
| parent | 4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae (diff) | |
Merge github.com:grpc/grpc into rollfwd
Diffstat (limited to 'src/node/ext')
| -rw-r--r-- | src/node/ext/call.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/node/ext/call.cc b/src/node/ext/call.cc index 9213d5e87d..39dc98a3ce 100644 --- a/src/node/ext/call.cc +++ b/src/node/ext/call.cc @@ -238,7 +238,9 @@ class SendMessageOp : public Op { } } send_message = BufferToByteBuffer(value); - out->data.send_message = send_message; + out->data.send_message.send_message = send_message; + PersistentValue *handle = new PersistentValue(value); + resources->handles.push_back(unique_ptr<PersistentValue>(handle)); return true; } bool IsFinalOp() { @@ -352,8 +354,14 @@ class GetMetadataOp : public Op { return scope.Escape(ParseMetadata(&recv_metadata)); } +<<<<<<< HEAD bool ParseOp(Local<Value> value, grpc_op *out) { out->data.recv_initial_metadata = &recv_metadata; +======= + bool ParseOp(Local<Value> value, grpc_op *out, + shared_ptr<Resources> resources) { + out->data.recv_initial_metadata.recv_initial_metadata = &recv_metadata; +>>>>>>> 4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae return true; } bool IsFinalOp() { @@ -384,8 +392,14 @@ class ReadMessageOp : public Op { return scope.Escape(ByteBufferToBuffer(recv_message)); } +<<<<<<< HEAD bool ParseOp(Local<Value> value, grpc_op *out) { out->data.recv_message = &recv_message; +======= + bool ParseOp(Local<Value> value, grpc_op *out, + shared_ptr<Resources> resources) { + out->data.recv_message.recv_message = &recv_message; +>>>>>>> 4ffcb2058df96c1fa0a319cd3e5d4aa9358e5bae return true; } bool IsFinalOp() { |