From 74672b6719903332c0b5969fa0bffd12c13cf121 Mon Sep 17 00:00:00 2001 From: David Reiss Date: Tue, 29 Apr 2008 23:09:11 +0000 Subject: [PATCH] Java: In toString for generated structs, handle nulls. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665671 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/generate/t_java_generator.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc index ac0a1ebf..e7490db0 100644 --- a/compiler/cpp/src/generate/t_java_generator.cc +++ b/compiler/cpp/src/generate/t_java_generator.cc @@ -1144,11 +1144,7 @@ void t_java_generator::generate_java_struct_tostring(ofstream& out, indent(out) << "sb.append(\"," << (*f_iter)->get_name() << ":\");" << endl; } t_type* ttype = (*f_iter)->get_type(); - if (ttype->is_xception() || ttype->is_struct()) { - indent(out) << "sb.append(this." << (*f_iter)->get_name() << ".toString());" << endl; - } else { - indent(out) << "sb.append(this." << (*f_iter)->get_name() << ");" << endl; - } + indent(out) << "sb.append(this." << (*f_iter)->get_name() << ");" << endl; } out << indent() << "sb.append(\")\");" << endl << -- 2.17.1