Skip to content
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

[#1722] avoid NPE in TupleTransformatorFactory #1723

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[#1722] avoid NPE in TupleTransformatorFactory #1723

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...src/main/java/com/blazebit/persistence/view/impl/objectbuilder/ViewTypeObjectBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,6 @@ public <X extends SelectBuilder<X>> void applySelects(X queryBuilder) {

private boolean hasSubFetches(String attributePath) {
String fetchedPath = fetches.ceiling(attributePath);
return fetchedPath != null && (fetchedPath.length() == attributePath.length() || fetchedPath.startsWith(attributePath) && fetchedPath.length() > attributePath.length() && fetchedPath.charAt(attributePath.length()) == '.');
return fetchedPath != null && (fetchedPath.equals(attributePath) || fetchedPath.startsWith(attributePath) && fetchedPath.charAt(attributePath.length()) == '.');
}
}
4 changes: 3 additions & 1 deletion ...blazebit/persistence/view/impl/objectbuilder/transformator/TupleTransformatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,9 @@ public int getConsumeEndIndex() {

@Override
public Object[] transform(Object[] tuple, UpdatableViewMap updatableViewMap) {
if (Arrays.binarySearch(subtypeIndexes, ((Number) tuple[classMappingIndex]).intValue()) >= 0) {
Number index = (Number) tuple[classMappingIndex];
// FIXME: The null check is just a crude fix for https://github.com/Blazebit/blaze-persistence/issues/1722
if (index != null && Arrays.binarySearch(subtypeIndexes, index.intValue()) >= 0) {
return delegate.transform(tuple, updatableViewMap);
} else {
return tuple;
Expand Down