diff options
| author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-10-30 07:33:39 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-10-30 07:33:39 -0700 |
| commit | 46f8a79826dbd6d9c7968baa4939d7e1b6e2b47c (patch) | |
| tree | 0eef3fbf64b377e72e1dd3b5ed891903e04909c6 /csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs | |
| parent | a74e912a8be1274fd561db5e8133937d4e9c4a2b (diff) | |
| parent | f5a0a7feeb7dcde7f5eddd4548cbf08e9e3ccd57 (diff) | |
| download | protobuf-46f8a79826dbd6d9c7968baa4939d7e1b6e2b47c.tar.gz protobuf-46f8a79826dbd6d9c7968baa4939d7e1b6e2b47c.tar.bz2 protobuf-46f8a79826dbd6d9c7968baa4939d7e1b6e2b47c.zip | |
Merge pull request #905 from jskeet/wrapper-clear
Fix clearing wrapper type fields with reflection.
Diffstat (limited to 'csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs b/csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs index de92fbc1..bbac2173 100644 --- a/csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs +++ b/csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs @@ -61,7 +61,7 @@ namespace Google.Protobuf.Reflection // TODO: Validate that this is a reasonable single field? (Should be a value type, a message type, or string/ByteString.) object defaultValue = - typeof(IMessage).IsAssignableFrom(clrType) ? null + descriptor.FieldType == FieldType.Message ? null : clrType == typeof(string) ? "" : clrType == typeof(ByteString) ? ByteString.Empty : Activator.CreateInstance(clrType); |