diff options
| author |  Jon Skeet <jonskeet@google.com> | 2016-01-13 14:05:06 +0000 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2016-01-13 14:05:06 +0000 |
| commit | f2fe50bfc516cdab99f51fa2ca90ba0db1ef6637 (patch) | |
| tree | e127cc82f34cdd3b8a65c39249d5a49b608f3131 /csharp/src/Google.Protobuf.Conformance | |
| parent | 73c003c309235485c0e53f2075242567c88a72bc (diff) | |
JSON conformance test fixes
- Spot an Any without a type URL
- In the conformance test runner, catch exceptions due to generally-invalid JSON
Diffstat (limited to 'csharp/src/Google.Protobuf.Conformance')
| -rw-r--r-- | csharp/src/Google.Protobuf.Conformance/Program.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/csharp/src/Google.Protobuf.Conformance/Program.cs b/csharp/src/Google.Protobuf.Conformance/Program.cs index 8f72c8f9..c40851c6 100644 --- a/csharp/src/Google.Protobuf.Conformance/Program.cs +++ b/csharp/src/Google.Protobuf.Conformance/Program.cs @@ -101,6 +101,10 @@ namespace Google.Protobuf.Conformance { return new ConformanceResponse { ParseError = e.Message }; } + catch (InvalidJsonException e) + { + return new ConformanceResponse { ParseError = e.Message }; + } switch (request.RequestedOutputFormat) { case global::Conformance.WireFormat.JSON: |