From 87577ef0015251c865a599f794a5ff1d5f9b35e9 Mon Sep 17 00:00:00 2001 From: jfarrell Date: Fri, 16 Aug 2013 09:26:05 -0400 Subject: [PATCH] THRIFT-2128: lib GO tests fail with funct ends without a return statement Client: go Patch: jfarrell Fix issue with go tests failing in go1 in the process function. --- compiler/cpp/src/generate/t_go_generator.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/cpp/src/generate/t_go_generator.cc b/compiler/cpp/src/generate/t_go_generator.cc index 288bfab4..eecc8362 100644 --- a/compiler/cpp/src/generate/t_go_generator.cc +++ b/compiler/cpp/src/generate/t_go_generator.cc @@ -2241,16 +2241,16 @@ void t_go_generator::generate_service_server(t_service* tservice) indent() << " if err != nil { return false, err }" << endl << indent() << " if processor, ok := p.GetProcessorFunction(name); ok {" << endl << indent() << " return processor.Process(seqId, iprot, oprot)" << endl << - indent() << " } else {" << endl << - indent() << " iprot.Skip(thrift.STRUCT)" << endl << - indent() << " iprot.ReadMessageEnd()" << endl << - indent() << " " << x << " := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, \"Unknown function \" + name)" << endl << - indent() << " oprot.WriteMessageBegin(name, thrift.EXCEPTION, seqId)" << endl << - indent() << " " << x << ".Write(oprot)" << endl << - indent() << " oprot.WriteMessageEnd()" << endl << - indent() << " oprot.Flush()" << endl << - indent() << " return false, " << x << endl << indent() << " }" << endl << + indent() << " iprot.Skip(thrift.STRUCT)" << endl << + indent() << " iprot.ReadMessageEnd()" << endl << + indent() << " " << x << " := thrift.NewTApplicationException(thrift.UNKNOWN_METHOD, \"Unknown function \" + name)" << endl << + indent() << " oprot.WriteMessageBegin(name, thrift.EXCEPTION, seqId)" << endl << + indent() << " " << x << ".Write(oprot)" << endl << + indent() << " oprot.WriteMessageEnd()" << endl << + indent() << " oprot.Flush()" << endl << + indent() << " return false, " << x << endl << + indent() << "" << endl << indent() << "}" << endl << endl; } else { f_service_ << -- 2.17.1