BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-07 22:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed vector of unions crash in java (#5190)

Browse Source 
* Fixed vector of unions crash in java

* Regenerated test code

* Fixed windows tests
This commit is contained in:
Kamil Rojewski
2019-02-21 19:50:13 +01:00
committed by Wouter van Oortmerssen
parent 69d761d15e
commit 8f8fb2b367
21 changed files with 75 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/idl_gen_general.cpp
View File

@@ -95,7 +95,7 @@ const LanguageParameters &GetLangParams(IDLOptions::Language lang) {
"",
"import java.nio.*;\nimport java.lang.*;\nimport "
"java.util.*;\nimport com.google.flatbuffers.*;\n",
"\n@SuppressWarnings(\"unused\")",
"\n@SuppressWarnings(\"unused\")\n",
"\n@javax.annotation.Generated(value=\"flatc\")\n",
{
"/**",
@@ -1035,6 +1035,8 @@ class GeneralGenerator : public BaseGenerator {
? index
: lang_.accessor_prefix + "__indirect(" + index + ")";
code += ", " + lang_.accessor_prefix + "bb";
} else if (vectortype.base_type == BASE_TYPE_UNION) {
code += index + " - bb_pos";
} else {
code += index;
}