diff options
| author | Jon Skeet <skeet@pobox.com> | 2016-05-06 06:29:03 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2016-05-06 06:29:03 +0100 |
| commit | 5b5e369b185325c49ee450965ceceb6ac5586b16 (patch) | |
| tree | 5dac86476f4d2cafa84333d3c1114a9632c71395 /csharp/src/Google.Protobuf/JsonParser.cs | |
| parent | 17b6fc31eb8a9b65501cd7c53235a88efdc94394 (diff) | |
| parent | 61307b86f561721ac47ecd74d9fd1dffa0acad53 (diff) | |
| download | protobuf-5b5e369b185325c49ee450965ceceb6ac5586b16.tar.gz protobuf-5b5e369b185325c49ee450965ceceb6ac5586b16.tar.bz2 protobuf-5b5e369b185325c49ee450965ceceb6ac5586b16.zip | |
Merge pull request #1471 from jskeet/any-host
Allow custom type URL prefixes in Any.Pack
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) |