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

diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc
index ac0a1eb..e7490db 100644 (file)
--- 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 <<