diff options
| author | Jisi Liu <liujisi@google.com> | 2018-01-04 14:26:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 14:26:24 -0800 |
| commit | a3868af12be724f808faa21a29e7b4931e30bed1 (patch) | |
| tree | 3df23c4174287023b569108eb133db0f9c310646 /src/google/protobuf/message.cc | |
| parent | eca1d2a7113b3d57f900f69661342c0078c956c4 (diff) | |
| parent | ec826c5a592126ddb6b12b47e6e1fb6232ce340d (diff) | |
| download | protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.tar.gz protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.tar.bz2 protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.zip | |
Merge pull request #4131 from pherl/merge
Merge 3.5.x branch into master
Diffstat (limited to 'src/google/protobuf/message.cc')
| -rw-r--r-- | src/google/protobuf/message.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/message.cc b/src/google/protobuf/message.cc index a0d3feba..42ec0337 100644 --- 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 { |