From 796381d857f3a51fd1b059200425c84326cbcfe3 Mon Sep 17 00:00:00 2001 From: Bryan Duxbury Date: Thu, 29 Jan 2009 22:13:56 +0000 Subject: [PATCH] THRIFT-290. java: Metadata map doesn't properly reference external thrift file's types The code generator now uses full namespaces to refer to the classes. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@739045 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/generate/t_java_generator.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc index 81fb5906..30e7f78b 100644 --- a/compiler/cpp/src/generate/t_java_generator.cc +++ b/compiler/cpp/src/generate/t_java_generator.cc @@ -643,7 +643,7 @@ void t_java_generator::generate_java_struct_definition(ofstream &out, // Static initializer to populate global class to struct metadata map indent(out) << "static {" << endl; indent_up(); - indent(out) << "FieldMetaData.addStructMetaDataMap(" << tstruct->get_name() << ".class, metaDataMap);" << endl; + indent(out) << "FieldMetaData.addStructMetaDataMap(" << type_name(tstruct) << ".class, metaDataMap);" << endl; indent_down(); indent(out) << "}" << endl << endl; @@ -1578,7 +1578,7 @@ void t_java_generator::generate_field_value_meta_data(std::ofstream& out, t_type indent_up(); indent_up(); if (type->is_struct()){ - indent(out) << "new StructMetaData(TType.STRUCT, " << type->get_name() << ".class"; + indent(out) << "new StructMetaData(TType.STRUCT, " << type_name(type) << ".class"; } else if (type->is_container()){ if (type->is_list()){ indent(out) << "new ListMetaData(TType.LIST, "; -- 2.17.1