Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

encoding/xml: allow attributes stored in pointers to be marshaled.

Browse source 
Fixes #5334.

R=golang-dev, dave, rsc
CC=golang-dev
https://golang.org/cl/8653047
This commit is contained in:
Dmitriy Shelenin 2013-08-08 10:40:51 -07:00 • committed by Brad Fitzpatrick
parent 3155115854
commit 547f1a6fe7
2 changed files with 43 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pkg/encoding/xml/marshal.go
View file

@ -271,7 +271,7 @@ func (p *printer) marshalValue(val reflect.Value, finfo *fieldInfo) error {
continue
}
fv := finfo.value(val)
if finfo.flags&fOmitEmpty != 0 && isEmptyValue(fv) {
if (finfo.flags&fOmitEmpty != 0 || fv.Kind() == reflect.Ptr) && isEmptyValue(fv) {
continue
}
p.WriteByte(' ')
@ -285,6 +285,11 @@ func (p *printer) marshalValue(val reflect.Value, finfo *fieldInfo) error {
}
p.WriteString(finfo.name)
p.WriteString(`="`)
// Handle pointer values by following the pointer,
// Pointer is known to be non-nil because we called isEmptyValue above.
if fv.Kind() == reflect.Ptr {
fv = fv.Elem()
}
if err := p.marshalSimple(fv.Type(), fv); err != nil {
return err
}
@ -363,6 +368,10 @@ func (p *printer) marshalStruct(tinfo *typeInfo, val reflect.Value) error {
continue
}
vf := finfo.value(val)
// Handle pointer values by following the pointer
if vf.Kind() == reflect.Ptr && !isEmptyValue(vf) {
vf = vf.Elem()
}
switch finfo.flags & fMode {
case fCharData:
var scratch [64]byte