diff options
| author | csharptest <roger@csharptest.net> | 2010-11-19 10:59:50 -0600 |
|---|---|---|
| committer | csharptest <roger@csharptest.net> | 2010-11-19 10:59:50 -0600 |
| commit | cb7fc657167962216bab007cd01a74945349cf17 (patch) | |
| tree | dee79ab5985146e9c4e342e1e127524c00f99418 /src/ProtocolBuffers | |
| parent | 272cb8aee775de65e08b4ab17c485cd678d08266 (diff) | |
| download | protobuf-cb7fc657167962216bab007cd01a74945349cf17.tar.gz protobuf-cb7fc657167962216bab007cd01a74945349cf17.tar.bz2 protobuf-cb7fc657167962216bab007cd01a74945349cf17.zip | |
Tests and fixes
Diffstat (limited to 'src/ProtocolBuffers')
| -rw-r--r-- | src/ProtocolBuffers/AbstractBuilder.cs | 4 | ||||
| -rw-r--r-- | src/ProtocolBuffers/GeneratedBuilder.cs | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ProtocolBuffers/AbstractBuilder.cs b/src/ProtocolBuffers/AbstractBuilder.cs index d613eca4..0d1279c7 100644 --- a/src/ProtocolBuffers/AbstractBuilder.cs +++ b/src/ProtocolBuffers/AbstractBuilder.cs @@ -129,6 +129,10 @@ namespace Google.ProtocolBuffers { this[field] = entry.Value; } } + + //Fix for unknown fields not merging, see java's AbstractMessage.Builder<T> line 236 + MergeUnknownFields(other.UnknownFields); + return ThisBuilder; } diff --git a/src/ProtocolBuffers/GeneratedBuilder.cs b/src/ProtocolBuffers/GeneratedBuilder.cs index 01d3d2dd..2ec2762f 100644 --- a/src/ProtocolBuffers/GeneratedBuilder.cs +++ b/src/ProtocolBuffers/GeneratedBuilder.cs @@ -158,6 +158,10 @@ namespace Google.ProtocolBuffers { this[field] = entry.Value; } } + + //Fix for unknown fields not merging, see java's AbstractMessage.Builder<T> line 236 + MergeUnknownFields(other.UnknownFields); + return ThisBuilder; } |