commit b547141797f17159fdb61abfb22e817b121fde8f
author Christian Lavoie <clavoie@apache.org> 周四 1月 27 21:05:45 2011 +0000
committer Christian Lavoie <clavoie@apache.org> 周四 1月 27 21:05:45 2011 +0000
tree 0966edb4fa2f247701fa0b5173197a62e4a6ba2a
parent 03ec1e4696d5a9bea0dd7df4bcc7f727f4f0aab5

Apply THRIFT-993's patch from Rich Salz (reverting the oneway caching):

(THRIFT-993) Some improvements in C++ stubs for oneway operations



git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1064303 13f79535-47bb-0310-9956-ffa450edef68

compiler/cpp/src/generate/t_cpp_generator.cc

diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
index 4ee9d93..d6ebc32 100644
--- a/compiler/cpp/src/generate/t_cpp_generator.cc
+++ b/compiler/cpp/src/generate/t_cpp_generator.cc
@@ -2794,8 +2794,11 @@
     }
     out <<
       "void " << tservice->get_name() << "Processor" << class_suffix << "::" <<
-      "process_" << tfunction->get_name() << "(int32_t seqid, " <<
-      prot_type << "* iprot, " << prot_type << "* oprot, void* callContext)" << endl;
+      "process_" << tfunction->get_name() << "(" <<
+      "int32_t" << (tfunction->is_oneway() ? ", " : " seqid, ") <<
+      prot_type << "* iprot, " <<
+      prot_type << "*" << (tfunction->is_oneway() ? ", " : " oprot, ")
+      << "void* callContext)" << endl;
     scope_up(out);
 
     if (gen_templates_ && !specialized) {
@@ -2882,16 +2885,12 @@
     if (!tfunction->is_oneway()) {
       for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
         out << " catch (" << type_name((*x_iter)->get_type()) << " &" << (*x_iter)->get_name() << ") {" << endl;
-        if (!tfunction->is_oneway()) {
-          indent_up();
-          out <<
-            indent() << "result." << (*x_iter)->get_name() << " = " << (*x_iter)->get_name() << ";" << endl <<
-            indent() << "result.__isset." << (*x_iter)->get_name() << " = true;" << endl;
-          indent_down();
-          out << indent() << "}";
-        } else {
-          out << "}";
-        }
+        indent_up();
+        out <<
+          indent() << "result." << (*x_iter)->get_name() << " = " << (*x_iter)->get_name() << ";" << endl <<
+          indent() << "result.__isset." << (*x_iter)->get_name() << " = true;" << endl;
+        indent_down();
+        out << indent() << "}";
       }
     }