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

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