Skip to content

fix(persistence): stop ProtobufPersistedData.isArray() lying for maps #5379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
soloturn wants to merge 1 commit into
base: develop
Choose a base branch
from
+7 −1
Open

fix(persistence): stop ProtobufPersistedData.isArray() lying for maps #5379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ...n/java/org/terasology/engine/persistence/typeHandling/protobuf/ProtobufPersistedData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,13 @@ public boolean isBytes() {

@Override
public boolean isArray() {
return true;
// A single EntityData.Value message doubles as a scalar, an array (repeated scalar/nested-value
// fields) and a value map (name-value pairs), so unlike the Gson-backed PersistedData this can't
// just check "is this element shaped like a JSON array". Every other kind (including scalars,
// which callers already treat as size-1 arrays via getAsArray()/getArrayItem()) genuinely can be
// read as an array; only a real value map can't - mirror isValueMap()'s own check instead of
// reporting true unconditionally. See #5069.
return data.getNameValueCount() == 0;
}

@Override
Expand Down
Loading