BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-02 12:05:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Java] Fix key lookup returning null clashing with default value (#7236)

Browse Source 
A field with key attribute must always be written on the message so it
can be looked up by key. There is a edge case where inserting a key
field with same value as default would prevent it to be written on
the message and later cannot be found when searched by key.
This commit is contained in:
Paulo Pinheiro
2022-04-12 02:16:41 +02:00
committed by GitHub
parent 7f663b1204
commit 7181d77700
9 changed files with 186 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/idl_gen_java.cpp
View File

@@ -1091,7 +1091,7 @@ class JavaGenerator : public BaseGenerator {
it != struct_def.fields.vec.end(); ++it) {
auto &field = **it;
if (field.deprecated) continue;
if (field.key) key_field = &field;
code += " public static void " + namer_.Method("add", field);
code += "(FlatBufferBuilder builder, ";
code += GenTypeBasic(DestinationType(field.value.type, false));
@@ -1099,13 +1099,25 @@ class JavaGenerator : public BaseGenerator {
if (!IsScalar(field.value.type.base_type)) argname += "Offset";
code += " " + argname + ") { builder.add";
code += GenMethod(field.value.type) + "(";
code += NumToString(it - struct_def.fields.vec.begin()) + ", ";
code += SourceCastBasic(field.value.type);
code += argname;
code += ", ";
code += SourceCastBasic(field.value.type);
code += GenDefaultValue(field);
code += "); }\n";
if (field.key) {
// field has key attribute, so always need to exist
// even if its value is equal to default.
// Generated code will bypass default checking
// resulting in { builder.addShort(name); slot(id); }
key_field = &field;
code += SourceCastBasic(field.value.type);
code += argname;
code += "); builder.slot(" + NumToString(it - struct_def.fields.vec.begin()) + "); }\n";
} else {
code += NumToString(it - struct_def.fields.vec.begin()) + ", ";
code += SourceCastBasic(field.value.type);
code += argname;
code += ", ";
code += SourceCastBasic(field.value.type);
code += GenDefaultValue(field);
code += "); }\n";
}
if (IsVector(field.value.type)) {
auto vector_type = field.value.type.VectorType();
auto alignment = InlineAlignment(vector_type);