Merge pull request #4043 from pherl/flush

Explicitly propagate the status of Flush().

Merge pull request #4043 from pherl/flush
Explicitly propagate the status of Flush().
8521624e · Jisi Liu · GitHub · f69a5db6 · 6b01e644 · 8521624e
Unverified Commit 8521624e authored Dec 13, 2017 by Jisi Liu Committed by GitHub Dec 13, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

message.cc src/google/protobuf/message.cc +2 -2

No files found.
--- a/src/google/protobuf/message.cc
+++ b/src/google/protobuf/message.cc
@@ -170,12 +170,12 @@ size_t Message::SpaceUsedLong() const {

 bool Message::SerializeToFileDescriptor(int file_descriptor) const {
  io::FileOutputStream output(file_descriptor);
-  return SerializeToZeroCopyStream(&output);
+  return SerializeToZeroCopyStream(&output) && output.Flush();
 }

 bool Message::SerializePartialToFileDescriptor(int file_descriptor) const {
  io::FileOutputStream output(file_descriptor);
-  return SerializePartialToZeroCopyStream(&output);
+  return SerializePartialToZeroCopyStream(&output) && output.Flush();
 }

 bool Message::SerializeToOstream(std::ostream* output) const {