From 4d064019fe9f68f491ec3ef3ea79aee9388e1917 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 31 Mar 2017 08:27:28 -0700
Subject: [PATCH 1/2] Call ref/unref, bugfixes

---
 ext/call.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/call.cc b/ext/call.cc
index 244546d3..88bcd6db 100644
--- a/ext/call.cc
+++ b/ext/call.cc
@@ -520,7 +520,7 @@ Call::Call(grpc_call *call) : wrapped_call(call),
 
 Call::~Call() {
   if (wrapped_call != NULL) {
-    grpc_call_destroy(wrapped_call);
+    grpc_call_unref(wrapped_call);
   }
 }
 
@@ -568,7 +568,7 @@ void Call::CompleteBatch(bool is_final_op) {
   }
   this->pending_batches--;
   if (this->has_final_op_completed && this->pending_batches == 0) {
-    grpc_call_destroy(this->wrapped_call);
+    grpc_call_unref(this->wrapped_call);
     this->wrapped_call = NULL;
   }
 }

From 8934a59db0a410d6ae26e4d969ef8379a1257529 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 19 Apr 2017 09:45:47 -0700
Subject: [PATCH 2/2] Fix broken merge

---
 ext/call.cc | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/ext/call.cc b/ext/call.cc
index a51ad836..fd3463b8 100644
--- a/ext/call.cc
+++ b/ext/call.cc
@@ -248,13 +248,9 @@ class SendMessageOp : public Op {
     out->data.send_message.send_message = send_message;
     return true;
   }
-<<<<<<< HEAD
-  bool IsFinalOp() { return false; }
 
-=======
   bool IsFinalOp() { return false; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "send_message"; }
@@ -269,15 +265,10 @@ class SendClientCloseOp : public Op {
     EscapableHandleScope scope;
     return scope.Escape(Nan::True());
   }
-<<<<<<< HEAD
-  bool ParseOp(Local<Value> value, grpc_op *out) { return true; }
-  bool IsFinalOp() { return false; }
 
-=======
   bool ParseOp(Local<Value> value, grpc_op *out) { return true; }
   bool IsFinalOp() { return false; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "client_close"; }
@@ -341,13 +332,9 @@ class SendServerStatusOp : public Op {
     out->data.send_status_from_server.status_details = &this->details;
     return true;
   }
-<<<<<<< HEAD
-  bool IsFinalOp() { return true; }
 
-=======
   bool IsFinalOp() { return true; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "send_status"; }
@@ -372,12 +359,9 @@ class GetMetadataOp : public Op {
     out->data.recv_initial_metadata.recv_initial_metadata = &recv_metadata;
     return true;
   }
-<<<<<<< HEAD
-  bool IsFinalOp() { return false; }
-=======
+
   bool IsFinalOp() { return false; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "metadata"; }
@@ -403,12 +387,9 @@ class ReadMessageOp : public Op {
     out->data.recv_message.recv_message = &recv_message;
     return true;
   }
-<<<<<<< HEAD
-  bool IsFinalOp() { return false; }
-=======
+
   bool IsFinalOp() { return false; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "read"; }
@@ -441,13 +422,9 @@ class ClientStatusOp : public Op {
              ParseMetadata(&metadata_array));
     return scope.Escape(status_obj);
   }
-<<<<<<< HEAD
-  bool IsFinalOp() { return true; }
 
-=======
   bool IsFinalOp() { return true; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "status"; }
@@ -469,12 +446,9 @@ class ServerCloseResponseOp : public Op {
     out->data.recv_close_on_server.cancelled = &cancelled;
     return true;
   }
-<<<<<<< HEAD
-  bool IsFinalOp() { return false; }
-=======
+
   bool IsFinalOp() { return false; }
   void OnComplete(bool success) {}
->>>>>>> e412a180602753972ac496560322e224a5db987f
 
  protected:
   std::string GetTypeString() const { return "cancelled"; }