more formatting changes

sheenaqotj · Apr 30, 2019 · 6b0806e · 6b0806e
1 parent c8a6841
commit 6b0806e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/grpcpp/server_impl.h b/include/grpcpp/server_impl.h
@@ -28,6 +28,7 @@
 #include <grpc/compression.h>
 #include <grpc/support/atm.h>
 #include <grpcpp/completion_queue.h>
+#include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/codegen/client_interceptor.h>
 #include <grpcpp/impl/codegen/grpc_library.h>
@@ -49,7 +50,6 @@ class ServerContext;
 
 namespace grpc_impl {
 
-class HealthCheckServiceInterface;
 class ServerInitializer;
 
 /// Represents a gRPC server.
@@ -99,7 +99,7 @@ class Server : public grpc::ServerInterface, private grpc::GrpcLibraryCodegen {
   grpc_server* c_server();
 
   /// Returns the health check service.
-  grpc_impl::HealthCheckServiceInterface* GetHealthCheckService() const {
+  grpc::HealthCheckServiceInterface* GetHealthCheckService() const {
     return health_check_service_.get();
   }
 
@@ -333,7 +333,7 @@ class Server : public grpc::ServerInterface, private grpc::GrpcLibraryCodegen {
 
   std::unique_ptr<grpc_impl::ServerInitializer> server_initializer_;
 
-  std::unique_ptr<grpc_impl::HealthCheckServiceInterface> health_check_service_;
+  std::unique_ptr<grpc::HealthCheckServiceInterface> health_check_service_;
   bool health_check_service_disabled_;
 
   // When appropriate, use a default callback generic service to handle

diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
@@ -753,9 +753,9 @@ class Server::CallbackRequest final : public Server::CallbackRequestBase {
         &server_->callback_unmatched_reqs_count_[method_index_], 1);
     grpc_metadata_array_init(&request_metadata_);
     ctx_.Setup(gpr_inf_future(GPR_CLOCK_REALTIME));
-    handler_data_ = nullptr;
     request_payload_ = nullptr;
     request_ = nullptr;
+    handler_data_ = nullptr;
     request_status_ = grpc::Status();
   }