svn commit: r940861 - /incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc

[br...@apache.org]

Author: bryanduxbury
Date: Tue May  4 14:01:14 2010
New Revision: 940861

URL: http://svn.apache.org/viewvc?rev=940861&view=rev
Log:
revert an unintentional commit to the java generator

Modified:
    incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc

Modified: incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc?rev=940861&r1=940860&r2=940861&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc (original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_java_generator.cc Tue May  4 14:01:14 2010
@@ -1899,11 +1899,7 @@ void t_java_generator::generate_java_bea
     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;
     }