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

Jump to bottom

[3.0] Bug 1245: NullPointerException from BatchFetchPolicy dataResults #1249

Merged
merged 1 commit into from
Aug 21, 2021
Merged

[3.0] Bug 1245: NullPointerException from BatchFetchPolicy dataResults #1249

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
10 changes: 4 additions & 6 deletions ...ipse.persistence.core/src/main/java/org/eclipse/persistence/queries/BatchFetchPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -52,11 +52,13 @@ public class BatchFetchPolicy implements Serializable, Cloneable {
protected transient Map<Object, Object> batchObjects;

public BatchFetchPolicy() {
this.type = BatchFetchType.JOIN;
this(BatchFetchType.JOIN);
}

public BatchFetchPolicy(BatchFetchType type) {
this.type = type;
this.dataResults = new HashMap<Object, List<AbstractRecord>>();
this.dataResults.put(this, new ArrayList<AbstractRecord>());
}

@Override
Expand Down Expand Up @@ -236,10 +238,6 @@ public boolean isAttributeBatchRead(ClassDescriptor mappingDescriptor, String at
* This is used for IN batching in batches.
*/
public void addDataResults(AbstractRecord row) {
if (this.dataResults == null) {
this.dataResults = new HashMap<>();
this.dataResults.put(this, new ArrayList<AbstractRecord>());
}
for (List<AbstractRecord> results : this.dataResults.values()) {
results.add(row);
}
Expand Down