From: jfarrell <jfarrell@apache.org>
Date: Fri, 16 Aug 2013 13:26:05 +0000 (-0400)
Subject: THRIFT-2128: lib GO tests fail with funct ends without a return statement
X-Git-Tag: 0.9.1~11
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=87577ef0015251c865a599f794a5ff1d5f9b35e9;p=common%2Fthrift.git

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.
---

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_ <<