diff options
author | Jon Skeet <skeet@pobox.com> | 2015-08-08 07:26:51 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-08-08 07:26:51 +0100 |
commit | e58cdbd2146bc8e2e2f5bf4bc8a7576f82535ae6 (patch) | |
tree | eef81bcb57f5b203ae4a1084473355f17c2a8620 /csharp/src/Google.Protobuf/JsonFormatter.cs | |
parent | cac45313235bd11b08e0803453a2ec5a7d4b652a (diff) | |
parent | c671095e91d2f0d6af25e1f046e526d4842f9e1c (diff) | |
download | protobuf-e58cdbd2146bc8e2e2f5bf4bc8a7576f82535ae6.tar.gz protobuf-e58cdbd2146bc8e2e2f5bf4bc8a7576f82535ae6.tar.bz2 protobuf-e58cdbd2146bc8e2e2f5bf4bc8a7576f82535ae6.zip |
Merge pull request #695 from jskeet/remove-todos
Tidying up
Diffstat (limited to 'csharp/src/Google.Protobuf/JsonFormatter.cs')
-rw-r--r-- | csharp/src/Google.Protobuf/JsonFormatter.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/csharp/src/Google.Protobuf/JsonFormatter.cs b/csharp/src/Google.Protobuf/JsonFormatter.cs index 7c4894be..12bbdfdd 100644 --- a/csharp/src/Google.Protobuf/JsonFormatter.cs +++ b/csharp/src/Google.Protobuf/JsonFormatter.cs @@ -158,7 +158,6 @@ namespace Google.Protobuf { var accessor = field.Accessor; // Oneofs are written later - // TODO: Change to write out fields in order, interleaving oneofs appropriately (as per binary format) if (field.ContainingOneof != null && field.ContainingOneof.Accessor.GetCaseFieldDescriptor(message) != field) { continue; @@ -425,7 +424,7 @@ namespace Google.Protobuf if (descriptor.FullName == ListValue.Descriptor.FullName) { var fieldAccessor = descriptor.Fields[ListValue.ValuesFieldNumber].Accessor; - WriteList(builder, fieldAccessor, (IList) fieldAccessor.GetValue(value)); + WriteList(builder, fieldAccessor, (IList) fieldAccessor.GetValue((IMessage) value)); return; } if (descriptor.FullName == Value.Descriptor.FullName) |