diff options
author | Pete Warden <pete@petewarden.com> | 2016-03-09 13:05:15 -0800 |
---|---|---|
committer | Pete Warden <pete@petewarden.com> | 2016-03-09 13:05:15 -0800 |
commit | bc2d6c2504b38dda4345e9960948d96102daccc3 (patch) | |
tree | 48ad357a166b3bf9715a20714db8c117d8150c41 /csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs | |
parent | f0c1a8637218a03a083901493c9b3acdb6e5db57 (diff) | |
parent | 48ebb29a8ec118bf6b9ee39f6be42b57321c099a (diff) | |
download | protobuf-bc2d6c2504b38dda4345e9960948d96102daccc3.tar.gz protobuf-bc2d6c2504b38dda4345e9960948d96102daccc3.tar.bz2 protobuf-bc2d6c2504b38dda4345e9960948d96102daccc3.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs')
-rw-r--r-- | csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs index df1292dc..4bd62cf3 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs @@ -33,6 +33,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; @@ -57,19 +58,19 @@ namespace Google.Protobuf.WellKnownTypes var firstInvalid = paths.FirstOrDefault(p => !ValidatePath(p)); if (firstInvalid == null) { - var builder = new StringBuilder(); - JsonFormatter.WriteString(builder, string.Join(",", paths.Select(JsonFormatter.ToCamelCase))); - return builder.ToString(); + var writer = new StringWriter(); + JsonFormatter.WriteString(writer, string.Join(",", paths.Select(JsonFormatter.ToCamelCase))); + return writer.ToString(); } else { if (diagnosticOnly) { - var builder = new StringBuilder(); - builder.Append("{ \"@warning\": \"Invalid FieldMask\", \"paths\": "); - JsonFormatter.Default.WriteList(builder, (IList) paths); - builder.Append(" }"); - return builder.ToString(); + var writer = new StringWriter(); + writer.Write("{ \"@warning\": \"Invalid FieldMask\", \"paths\": "); + JsonFormatter.Default.WriteList(writer, (IList)paths); + writer.Write(" }"); + return writer.ToString(); } else { |