Author: bryanduxbury
Date: Sat Mar 7 03:08:37 2009
New Revision: 751180
URL: http://svn.apache.org/viewvc?rev=751180&view=rev
Log:
THRIFT-359. java: nocamel style breaks generated services
This patch makes the generated code respect the nocamel option.
Modified:
incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc
Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc?rev=751180&r1=751179&r2=751180&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc
(original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc Sat
Mar 7 03:08:37 2009
@@ -93,6 +93,7 @@
void generate_function_helpers(t_function* tfunction);
std::string get_cap_name(std::string name);
std::string generate_isset_check(t_field* field);
+ std::string generate_isset_check(std::string field);
void generate_isset_set(ofstream& out, t_field* field);
void generate_service_interface (t_service* tservice);
@@ -1849,7 +1850,7 @@
// Careful, only return _result if not a void function
if (!(*f_iter)->get_returntype()->is_void()) {
f_service_ <<
- indent() << "if (result.isSetSuccess()) {" << endl <<
+ indent() << "if (result." << generate_isset_check("success") << ")
{" << endl <<
indent() << " return result.success;" << endl <<
indent() << "}" << endl;
}
@@ -2945,7 +2946,11 @@
}
std::string t_java_generator::generate_isset_check(t_field* field) {
- return "is" + get_cap_name("set") + get_cap_name(field->get_name()) + "()";
+ return generate_isset_check(field->get_name());
+}
+
+std::string t_java_generator::generate_isset_check(std::string field_name) {
+ return "is" + get_cap_name("set") + get_cap_name(field_name) + "()";
}
void t_java_generator::generate_isset_set(ofstream& out, t_field* field) {
