diff options
| author | Jos Hickson <jos.hickson@gmail.com> | 2016-05-11 09:23:46 +0100 |
|---|---|---|
| committer | Jos Hickson <jos.hickson@gmail.com> | 2016-05-11 09:23:46 +0100 |
| commit | 2b22b611a8af9e9d06491de2ebcc5d9b962e544c (patch) | |
| tree | 1d8b5a7399380da5fb3260e2f8eaa2b8cf31bec2 /csharp/src/Google.Protobuf/JsonParser.cs | |
| parent | 48ebb29a8ec118bf6b9ee39f6be42b57321c099a (diff) | |
| parent | a1938b2aa9ca86ce7ce50c27ff9737c1008d2a03 (diff) | |
| download | protobuf-2b22b611a8af9e9d06491de2ebcc5d9b962e544c.tar.gz protobuf-2b22b611a8af9e9d06491de2ebcc5d9b962e544c.tar.bz2 protobuf-2b22b611a8af9e9d06491de2ebcc5d9b962e544c.zip | |
Merge remote-tracking branch 'refs/remotes/google/master'
Diffstat (limited to 'csharp/src/Google.Protobuf/JsonParser.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf/JsonParser.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf/JsonParser.cs b/csharp/src/Google.Protobuf/JsonParser.cs index 80d3013d..d738ebb0 100644 --- a/csharp/src/Google.Protobuf/JsonParser.cs +++ b/csharp/src/Google.Protobuf/JsonParser.cs @@ -513,7 +513,7 @@ namespace Google.Protobuf throw new InvalidProtocolBufferException("Expected string value for Any.@type"); } string typeUrl = token.StringValue; - string typeName = JsonFormatter.GetTypeName(typeUrl); + string typeName = Any.GetTypeName(typeUrl); MessageDescriptor descriptor = settings.TypeRegistry.Find(typeName); if (descriptor == null) |