github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1836 - NPE with findCount() on bean with @Aggregation, Regression in 11.45.1

Browse Source
This commit is contained in:
rob bygrave
2019-10-10 08:55:01 +13:00
parent 769fc485ec
commit a3f9c4c889
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+5 -3
View File
@@ -3213,9 +3213,11 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
private boolean includesAggregation(OrmQueryProperties rootProps) {
if (rootProps != null) {
final Set<String> included = rootProps.getIncluded();
for (BeanProperty property : propertiesAggregate) {
if (included.contains(property.getName())) {
return true;
if (included != null) {
for (BeanProperty property : propertiesAggregate) {
if (included.contains(property.getName())) {
return true;
}
}
}
}