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

[br...@apache.org]

Author: bryanduxbury
Date: Wed Mar 11 23:40:57 2009
New Revision: 752696

URL: http://svn.apache.org/viewvc?rev=752696&view=rev
Log:
THRIFT-364. java: Use of enums in other namespaces breaks java generated code

This patch checks for different namespaces and prefixes appropriately.


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=752696&r1=752695&r2=752696&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 Wed Mar 11 23:40:57 2009
@@ -1034,10 +1034,16 @@
   out << indent() << "// check that fields of type enum have valid values" << endl;
   for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
     t_field* field = (*f_iter);
-    
+    t_type* type = field->get_type();
     // if field is an enum, check that its value is valid
-    if (field->get_type()->is_enum()){      
-      indent(out) << "if (__isset." << field->get_name() << " && !" << field->get_type()->get_name() << ".VALID_VALUES.contains(" << field->get_name() << ")){" << endl;
+    if (type->is_enum()){
+      string package = "";
+      t_program* program = type->get_program();
+      if (program != NULL && program != program_) {
+        package = program->get_namespace("java") + ".";
+      }
+
+      indent(out) << "if (__isset." << field->get_name() << " && !" << package << type->get_name() << ".VALID_VALUES.contains(" << field->get_name() << ")){" << endl;
       indent_up();
       indent(out) << "throw new TProtocolException(\"Invalid value of field '" << field->get_name() << "'!\");" << endl;
       indent_down();