Skip to content

Commit

Permalink
Revert "JSON string output funtions should clear() the destination fi…
Browse files Browse the repository at this point in the history
…rst"

We found that some code depended on the behavior of appending to the
string without clearing it first. The comments in json_util.h also make
it appear that the appending behavior is intentional, so I think we need
to stick with the old behavior.

This reverts commit 3cbe45a.
  • Loading branch information
acozzette committed Jun 18, 2019
1 parent b97b623 commit 1f0d817
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/google/protobuf/util/json_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ util::Status BinaryToJsonString(TypeResolver* resolver,
const std::string& binary_input,
std::string* json_output,
const JsonPrintOptions& options) {
json_output->clear();
io::ArrayInputStream input_stream(binary_input.data(), binary_input.size());
io::StringOutputStream output_stream(json_output);
return BinaryToJsonStream(resolver, type_url, &input_stream, &output_stream,
Expand Down Expand Up @@ -210,7 +209,6 @@ util::Status JsonToBinaryString(TypeResolver* resolver,
StringPiece json_input,
std::string* binary_output,
const JsonParseOptions& options) {
binary_output->clear();
io::ArrayInputStream input_stream(json_input.data(), json_input.size());
io::StringOutputStream output_stream(binary_output);
return JsonToBinaryStream(resolver, type_url, &input_stream, &output_stream,
Expand Down

0 comments on commit 1f0d817

Please sign in to comment.