commit bdf0d1d6f8539f6c7312eda57535396516ed7275
author Feng Xiao <xfxyjwf@gmail.com> Thu Jun 21 12:37:36 2018 -0700
committer GitHub <noreply@github.com> Thu Jun 21 12:37:36 2018 -0700
tree 4d0eaf0c74347a1280e6923d9413f09c09e2af87
parent e9063ccf199e9938f7ef563e3683d25375072df3
parent 6eb78b1e845620a56990b415fdf50a25594ea445

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

json: include field name in InvalidName status messages.

src/google/protobuf/util/json_util.cc

diff --git a/src/google/protobuf/util/json_util.cc b/src/google/protobuf/util/json_util.cc
index f81a7a3..9ad073d 100644
--- a/src/google/protobuf/util/json_util.cc
+++ b/src/google/protobuf/util/json_util.cc
@@ -127,7 +127,8 @@
   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,