From c8ee35805dc23143a8e0e774cee497deea4fa97d Mon Sep 17 00:00:00 2001 From: Bryan Duxbury Date: Tue, 4 May 2010 14:01:14 +0000 Subject: [PATCH] revert an unintentional commit to the java generator git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@940861 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 c5441937..f1eb5661 100644 --- a/compiler/cpp/src/generate/t_java_generator.cc +++ b/compiler/cpp/src/generate/t_java_generator.cc @@ -1899,11 +1899,7 @@ void t_java_generator::generate_java_bean_boilerplate(ofstream& out, indent(out) << "public boolean is" << get_cap_name("set") << cap_name << "() {" << endl; indent_up(); if (type_can_be_null(type)) { - indent(out) << "return this." << field_name << " != null"; - if (type->is_struct() && ((t_struct*)type)->is_union()) { - out << " && this." << field_name << ".isSet()"; - } - out << ";" << endl; + indent(out) << "return this." << field_name << " != null;" << endl; } else { indent(out) << "return __isset_bit_vector.get(" << isset_field_id(field) << ");" << endl; } -- 2.17.1