Merge pull request #4811 from htuch/invalid-name-json

json: include field name in InvalidName status messages.
7 years ago · bdf0d1d6f8
parent e9063ccf19 6eb78b1e84
commit bdf0d1d6f8
1 changed files with 2 additions and 1 deletions
--- a/src/google/protobuf/util/json_util.cc
+++ b/src/google/protobuf/util/json_util.cc
@ -127,7 +127,8 @@ class StatusErrorListener : public converter::ErrorListener {
  virtual void InvalidName(const converter::LocationTrackerInterface& loc,
                           StringPiece unknown_name, StringPiece message) {
    status_ = util::Status(util::error::INVALID_ARGUMENT,
-                             loc.ToString() + ": " + string(message));
+                           loc.ToString() + ": invalid name " +
+                               string(unknown_name) + ": " + string(message));
  }

  virtual void InvalidValue(const converter::LocationTrackerInterface& loc,