From 0b785ae8cf3dfef0937d300ce00bff8d4b173a18 Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Wed, 17 Oct 2018 14:37:35 -0700
Subject: [PATCH] Remove unneeded file

---
 include/grpcpp/impl/codegen/call.h   |  1 +
 src/cpp/client/client_interceptor.cc | 46 ----------------------------
 src/cpp/server/server_cc.cc          |  4 ++-
 3 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 src/cpp/client/client_interceptor.cc

diff --git a/include/grpcpp/impl/codegen/call.h b/include/grpcpp/impl/codegen/call.h
index 0fcfbc8263c..b4e5b05663b 100644
--- a/include/grpcpp/impl/codegen/call.h
+++ b/include/grpcpp/impl/codegen/call.h
@@ -1081,6 +1081,7 @@ class CallOpSet : public CallOpSetInterface,
  public:
   CallOpSet() : cq_tag_(this), return_tag_(this) {}
   void FillOps(Call* call) override {
+    done_intercepting_ = false;
     g_core_codegen_interface->grpc_call_ref(call->call());
     call_ =
         *call;  // It's fine to create a copy of call since it's just pointers
diff --git a/src/cpp/client/client_interceptor.cc b/src/cpp/client/client_interceptor.cc
deleted file mode 100644
index 02b3d825b66..00000000000
--- a/src/cpp/client/client_interceptor.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *
- * Copyright 2018 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <grpcpp/impl/codegen/client_interceptor.h>
-
-namespace grpc {
-namespace experimental {
-/*const ClientRpcInfo::grpc::InterceptedMessage& outgoing_message() {}
-grpc::InterceptedMessage* ClientRpcInfo::mutable_outgoing_message() {}
-const grpc::InterceptedMessage& ClientRpcInfo::received_message() {}
-grpc::InterceptedMessage* ClientRpcInfo::mutable_received_message() {}
-const Status ClientRpcInfo::*status() {}
-
-// Setter methods
-template <class M>
-void ClientRpcInfo::set_outgoing_message(M* msg) {}  // edit outgoing message
-template <class M>
-void ClientRpcInfo::set_received_message(M* msg) {}  // edit received message
-// for hijacking (can be called multiple times for streaming)
-template <class M>
-void ClientRpcInfo::inject_received_message(M* msg) {}
-void set_client_initial_metadata(
-    const ClientRpcInfo::std::multimap<grpc::string, grpc::string>& overwrite) {
-}
-void ClientRpcInfo::set_server_initial_metadata(
-    const std::multimap<grpc::string, grpc::string>& overwrite) {}
-void ClientRpcInfo::set_server_trailing_metadata(
-    const std::multimap<grpc::string, grpc::string>& overwrite) {}
-void ClientRpcInfo::set_status(Status status) {}*/
-}  // namespace experimental
-}  // namespace grpc
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index a4a5e9f0085..807a66baefb 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -271,6 +271,7 @@ class Server::SyncRequest final : public internal::CompletionQueueTag {
   grpc_metadata_array request_metadata_;
   grpc_byte_buffer* request_payload_;
   grpc_completion_queue* cq_;
+  bool done_intercepting_ = false;
 };
 
 // Implementation of ThreadManager. Each instance of SyncRequestThreadManager
@@ -319,7 +320,8 @@ class Server::SyncRequestThreadManager : public ThreadManager {
     }
 
     if (ok) {
-      // Calldata takes ownership of the completion queue inside sync_req
+      // Calldata takes ownership of the completion queue and interceptors
+      // inside sync_req
       SyncRequest::CallData cd(server_, sync_req);
       // Prepare for the next request
       if (!IsShutdown()) {