From: Bryan Duxbury <bryanduxbury@apache.org>
Date: Fri, 18 Dec 2009 19:34:25 +0000 (+0000)
Subject: THRIFT-653. java: Fix toString method for enums
X-Git-Tag: 0.3.0~150
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=e533bace3d462ebad7c65d7de4fd167a0ffbe740;p=common%2Fthrift.git

THRIFT-653. java: Fix toString method for enums

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@892357 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 24c7ef54..1282e2de 100644
--- a/compiler/cpp/src/generate/t_java_generator.cc
+++ b/compiler/cpp/src/generate/t_java_generator.cc
@@ -1933,16 +1933,6 @@ void t_java_generator::generate_java_struct_tostring(ofstream& out,
       indent(out) << "    sb.append(Integer.toHexString(this." << field->get_name() << "[i]).length() > 1 ? Integer.toHexString(this." << field->get_name() << "[i]).substring(Integer.toHexString(this." << field->get_name() << "[i]).length() - 2).toUpperCase() : \"0\" + Integer.toHexString(this." << field->get_name() << "[i]).toUpperCase());" <<endl;
       indent(out) << "  }" << endl;
       indent(out) << "  if (this." << field->get_name() << ".length > 128) sb.append(\" ...\");" << endl;
-    } else if(field->get_type()->is_enum()) {
-      indent(out) << "String " << field->get_name() << "_name = " << field->get_name() << ".name();"<< endl;
-      indent(out) << "if (" << field->get_name() << "_name != null) {" << endl;
-      indent(out) << "  sb.append(" << field->get_name() << "_name);" << endl;
-      indent(out) << "  sb.append(\" (\");" << endl;
-      indent(out) << "}" << endl;
-      indent(out) << "sb.append(this." << field->get_name() << ");" << endl;
-      indent(out) << "if (" << field->get_name() << "_name != null) {" << endl;
-      indent(out) << "  sb.append(\")\");" << endl;
-      indent(out) << "}" << endl;
     } else {
       indent(out) << "sb.append(this." << (*f_iter)->get_name() << ");" << endl;
     }