diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-21 08:12:11 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-21 08:12:11 -0700 |
| commit | 933c955aafc734b75136510df38e877840c1f649 (patch) | |
| tree | 4f3dd658417d51c2da53b0f2e0285b437cc178e0 /include/grpc++/impl/codegen/server_interface.h | |
| parent | 89675154020e5bdabe654b5b65087fe3935b696a (diff) | |
| parent | 5bedd48c0e8b9582841c511037bc20781a6c681c (diff) | |
Merge remote-tracking branch 'upstream/master' into http_connect
Diffstat (limited to 'include/grpc++/impl/codegen/server_interface.h')
| -rw-r--r-- | include/grpc++/impl/codegen/server_interface.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/grpc++/impl/codegen/server_interface.h b/include/grpc++/impl/codegen/server_interface.h index 1f1b714cbf..4a00d7a3a1 100644 --- a/include/grpc++/impl/codegen/server_interface.h +++ b/include/grpc++/impl/codegen/server_interface.h @@ -134,7 +134,7 @@ class ServerInterface : public CallHook { virtual void ShutdownInternal(gpr_timespec deadline) = 0; - virtual int max_message_size() const = 0; + virtual int max_receive_message_size() const = 0; virtual grpc_server* server() = 0; @@ -205,8 +205,8 @@ class ServerInterface : public CallHook { bool FinalizeResult(void** tag, bool* status) GRPC_OVERRIDE { bool serialization_status = *status && payload_ && - SerializationTraits<Message>::Deserialize(payload_, request_, - server_->max_message_size()) + SerializationTraits<Message>::Deserialize( + payload_, request_, server_->max_receive_message_size()) .ok(); bool ret = RegisteredAsyncRequest::FinalizeResult(tag, status); *status = serialization_status && *status; |