| commit | 03c9d41eb04dbde3258e9392caf0adf1f4287a34 | [log] [tgz] |
|---|---|---|
| author | David Symonds <dsymonds@golang.org> | Thu Aug 26 14:23:18 2010 +1000 |
| committer | David Symonds <dsymonds@golang.org> | Thu Aug 26 14:23:18 2010 +1000 |
| tree | 93df3e34ff67cec6b188523d7f00fe438e1b53d0 | |
| parent | 3fa79f7dad8d975e193faff3fadeb0929ceaaa8f [diff] [blame] |
Sync from internal version.
- fix nil Marshaler fields
- fix text encoding of nil
R=r
CC=golang-dev
http://codereview.appspot.com/2023043
diff --git a/proto/text.go b/proto/text.go index 4d5446a..ee80c85 100644 --- a/proto/text.go +++ b/proto/text.go
@@ -189,6 +189,10 @@ } func marshalText(w io.Writer, pb interface{}, compact bool) { + if pb == nil { + w.Write([]byte("<nil>")) + return + } aw := new(textWriter) aw.writer = w aw.complete = true