aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2018-06-21 12:37:36 -0700
committerGravatar GitHub <noreply@github.com>2018-06-21 12:37:36 -0700
commitbdf0d1d6f8539f6c7312eda57535396516ed7275 (patch)
tree4d0eaf0c74347a1280e6923d9413f09c09e2af87 /src
parente9063ccf199e9938f7ef563e3683d25375072df3 (diff)
parent6eb78b1e845620a56990b415fdf50a25594ea445 (diff)
Merge pull request #4811 from htuch/invalid-name-json
json: include field name in InvalidName status messages.
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/util/json_util.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/util/json_util.cc b/src/google/protobuf/util/json_util.cc
index f81a7a30..9ad073d8 100644
--- 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,