diff options
| author | Jie Luo <jieluo@google.com> | 2017-12-19 11:54:11 -0800 |
|---|---|---|
| committer | Jie Luo <jieluo@google.com> | 2017-12-19 15:38:02 -0800 |
| commit | b308580bb1c3f87a062ac1448a3e0bdaab9d40cf (patch) | |
| tree | ea211f27b3deb05a9ba5461079288020a11b5c8d /csharp/src/Google.Protobuf/JsonTokenizer.cs | |
| parent | 3a06fe1fc9590b534f403114a0668befba926947 (diff) | |
| download | protobuf-b308580bb1c3f87a062ac1448a3e0bdaab9d40cf.tar.gz protobuf-b308580bb1c3f87a062ac1448a3e0bdaab9d40cf.tar.bz2 protobuf-b308580bb1c3f87a062ac1448a3e0bdaab9d40cf.zip | |
Cherrypick for csharp, including:
Add preserve UnknownFields
Compare floating point values bitwise
Add auto-generated header to C# generated files
Diffstat (limited to 'csharp/src/Google.Protobuf/JsonTokenizer.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf/JsonTokenizer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf/JsonTokenizer.cs b/csharp/src/Google.Protobuf/JsonTokenizer.cs index 2fc1e7c3..0e403f78 100644 --- a/csharp/src/Google.Protobuf/JsonTokenizer.cs +++ b/csharp/src/Google.Protobuf/JsonTokenizer.cs @@ -245,7 +245,7 @@ namespace Google.Protobuf state = State.ObjectAfterColon; break; case ',': - ValidateState(State.ObjectAfterProperty | State.ArrayAfterValue, "Invalid state to read a colon: "); + ValidateState(State.ObjectAfterProperty | State.ArrayAfterValue, "Invalid state to read a comma: "); state = state == State.ObjectAfterProperty ? State.ObjectAfterComma : State.ArrayAfterComma; break; case '"': |