From a4dbe134862f8e8164f4f93bba9b3f5d1ade3748 Mon Sep 17 00:00:00 2001 From: Yuri Finkelstein Date: Thu, 21 Dec 2017 11:32:34 -1000 Subject: [PATCH] fixed java codegen bug documented in #4563 (#4565) * grpc bindings generator for Java and a few minor supporting changes in improvements * restored formatting before my previous changes for ease of review * Fixed grpc java code generation bug resulting in duplicate extractor declarations in case the same is used in more than a single RPC method * fixed previous merge issue * removed extra space * restored extra space * restored extra space * fixed java codegen bug documented in https://github.com/google/flatbuffers/issues/4563 --- src/idl_gen_general.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp index 79b4c2487..e9b8febb1 100644 --- a/src/idl_gen_general.cpp +++ b/src/idl_gen_general.cpp @@ -1036,11 +1036,12 @@ class GeneralGenerator : public BaseGenerator { for (auto kit = fields.begin(); kit != fields.end(); ++kit) { auto &key_field = **kit; if (key_field.key) { - code += " public " + sd.name + lang_.optional_suffix + " "; + auto qualified_name = WrapInNameSpace(sd); + code += " public " + qualified_name + lang_.optional_suffix + " "; code += MakeCamel(field.name, lang_.first_camel_upper) + "ByKey("; code += GenTypeNameDest(key_field.value.type) + " key)"; code += offset_prefix; - code += sd.name + ".__lookup_by_key("; + code += qualified_name + ".__lookup_by_key("; code += lang_.accessor_prefix + "__vector(o), key, "; code += lang_.accessor_prefix + "bb) : null; "; code += "}\n";