Fixed the reading of LinkedHashMap in v1 and v3 - #70
Merged
tcalmant merged 3 commits intoAug 12, 2026
Merged
Conversation
Copy link
Copy Markdown
Owner
Sorry, something went wrong.
The entries of a LinkedHashMap are written in the block data of the HashMap it extends, which the unmarshaller already stores in the annotations. v1 read that block data a second time and desynchronized the stream, v3 looked for the entries under the LinkedHashMap level and always returned an empty map. Fixes #30. Signed-off-by: Thomas Calmant <thomas.calmant@gmail.com>
Copy link
Copy Markdown
|
coverage: 92.721% (+0.4%) from 92.322% — fix-v1-linkedhashmap-double-read into master |
Sorry, something went wrong.
The offset time, offset date time, year, year month, month day and period handlers had no test. javaobj/v1/transformers.py is now fully covered. Signed-off-by: Thomas Calmant <thomas.calmant@gmail.com>
…p-double-read # Conflicts: # tests/test_v2.py # tests/test_v3.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The entries of a LinkedHashMap are written in the block data of the
java.util.HashMap it extends, and its own accessOrder field is written
right after the end of that block data.
JavaLinkedHashMap.__extra_loading__, while the unmarshaller had already
stored it in the annotations. The stream was then desynchronized and every
field read afterwards was wrong, which ended in
ValueError: Start of block data not found (originally reported as
Unknown OpCode in the stream: 0x8). The class now takes its content from
the annotations, like JavaMap and JavaList already do, and
accessOrder is read as the regular field it is.
level, but they are stored under the HashMap level: it silently returned
an empty map. The classes holding the content are now listed separately
from the classes the transformer handles.
Reported on the file of issue #30, which v1 now reads completely.
Test plan
LinkedHashMapExample.java documenting how they are built: a map nested in
an object, with a field written after it to detect a desynchronized stream,
and a map written on its own.
all check the same fixtures.
feed the annotations. The two tests checking the errors raised while
reading the stream were removed: that reading does not happen in the
transformer anymore, and the block data is already validated by the
unmarshaller.
and is now parsed by v1, v2 and v3.
Fixes #30