| commit | 68c687dc49948540b356a6b47931c9be4fcd0245 | [log] [tgz] |
|---|---|---|
| author | David Symonds <dsymonds@golang.org> | Mon Jul 27 19:06:00 2015 +1000 |
| committer | David Symonds <dsymonds@golang.org> | Tue Jul 28 10:51:06 2015 +1000 |
| tree | 2035bfd68fe9d987ce8aa7cbe5ea781346ecb4c5 | |
| parent | 6683654b7a0bb353e0501639c448d8f7dfb1206e [diff] [blame] |
Fix handling of RequiredNotSetError being returned by fields that implement Marshaler. This has a chance of breaking some code, but only if they were already silently broken.
diff --git a/proto/encode.go b/proto/encode.go index 72c780b..91f3f07 100644 --- a/proto/encode.go +++ b/proto/encode.go
@@ -529,7 +529,7 @@ } o.buf = append(o.buf, p.tagcode...) o.EncodeRawBytes(data) - return nil + return state.err } o.buf = append(o.buf, p.tagcode...)