From 2cf952730daa9e167bf261276fa77fad5312c6ff Mon Sep 17 00:00:00 2001
From: Yang Gao <yangg@google.com>
Date: Tue, 17 Feb 2015 11:01:07 -0800
Subject: [PATCH] Deserialization success should not override earlier failure

---
 src/cpp/common/call.cc   | 2 +-
 src/cpp/server/server.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cpp/common/call.cc b/src/cpp/common/call.cc
index df800d940dd..9ec93bc6262 100644
--- a/src/cpp/common/call.cc
+++ b/src/cpp/common/call.cc
@@ -254,7 +254,7 @@ void CallOpBuffer::FinalizeResult(void** tag, bool* status) {
   if (recv_message_) {
     if (recv_message_buf_) {
       got_message = true;
-      *status = DeserializeProto(recv_message_buf_, recv_message_);
+      *status &= DeserializeProto(recv_message_buf_, recv_message_);
       grpc_byte_buffer_destroy(recv_message_buf_);
       recv_message_buf_ = nullptr;
     } else {
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index 294eeae5850..35ced54aa78 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -314,7 +314,7 @@ class Server::AsyncRequest final : public CompletionQueueTag {
     *tag = tag_;
     if (*status && request_) {
       if (payload_) {
-        *status = DeserializeProto(payload_, request_);
+        *status &= DeserializeProto(payload_, request_);
       } else {
         *status = false;
       }