From 901d5552963224ed48c2c53da685771456f7fb98 Mon Sep 17 00:00:00 2001 From: Jens Geyer Date: Tue, 10 Sep 2013 21:33:17 +0200 Subject: [PATCH] THRIFT-2175 Wrong field type set for binary Patch: Jens Geyer --- compiler/cpp/src/generate/t_go_generator.cc | 3 ++- lib/go/thrift/serializer_types.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/cpp/src/generate/t_go_generator.cc b/compiler/cpp/src/generate/t_go_generator.cc index 24af687e..00af893e 100644 --- a/compiler/cpp/src/generate/t_go_generator.cc +++ b/compiler/cpp/src/generate/t_go_generator.cc @@ -3129,10 +3129,11 @@ string t_go_generator::type_to_enum(t_type* type) throw "NO T_VOID CONSTRUCT"; case t_base_type::TYPE_STRING: + /* this is wrong, binary is still a string type internally if (((t_base_type*)type)->is_binary()) { return "thrift.BINARY"; } - + */ return "thrift.STRING"; case t_base_type::TYPE_BOOL: diff --git a/lib/go/thrift/serializer_types.go b/lib/go/thrift/serializer_types.go index 2ce353b1..8416b856 100644 --- a/lib/go/thrift/serializer_types.go +++ b/lib/go/thrift/serializer_types.go @@ -470,7 +470,7 @@ func (p *TestStruct) writeField7(oprot TProtocol) (err error) { func (p *TestStruct) writeField8(oprot TProtocol) (err error) { if p.Bin != nil { - if err := oprot.WriteFieldBegin("bin", BINARY, 8); err != nil { + if err := oprot.WriteFieldBegin("bin", STRING, 8); err != nil { return fmt.Errorf("%T write field begin error 8:bin: %s", p, err) } if err := oprot.WriteBinary(p.Bin); err != nil { -- 2.17.1