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

This commit is contained in:
rob bygrave committed 2019-10-10 08:55:01 +13:00
1 parent 769fc485ec
commit a3f9c4c889
2 files changed
+23 -3

No files matched your search

@@ -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;
}
}
}
}