Merge pull request #496 from FgForrest/dev

fix(#495): NPE in AttributeBitmap calculation
FgForrest · Mar 19, 2024 · 705c161 · 705c161
2 parents fd59206 + 11ad92a
commit 705c161
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/evita_engine/src/main/java/io/evitadb/core/query/filter/FilterByVisitor.java b/evita_engine/src/main/java/io/evitadb/core/query/filter/FilterByVisitor.java
@@ -397,14 +397,6 @@ public AttributeSchemaContract getAttributeSchema(@Nonnull EntitySchemaContract
 		return getProcessingScope().getAttributeSchemaAccessor().getAttributeSchema(entitySchema, attributeName, requiredTrait);
 	}
 
-	/**
-	 * Returns attribute values from current scope.
-	 */
-	@Nonnull
-	public Stream<Optional<AttributeValue>> getAttributeValueStream(@Nonnull EntityContract entity, @Nonnull String attributeName, @Nonnull Locale locale) {
-		return getProcessingScope().getAttributeValueStream(entity, attributeName, locale);
-	}
-
 	/**
 	 * Method returns true if any of the siblings of the currently examined query matches any of the passed types.
 	 */

diff --git a/.../io/evitadb/core/query/filter/translator/attribute/alternative/AttributeBitmapFilter.java b/.../io/evitadb/core/query/filter/translator/attribute/alternative/AttributeBitmapFilter.java
@@ -131,8 +131,11 @@ public Bitmap filter(@Nonnull FilterByVisitor filterByVisitor) {
 					filter = filterFactory.apply(attributeSchema);
 				}
 				// and filter by predicate
-				if (filter != null && filter.test(attributeValueAccessor.apply(entity, attributeName))) {
-					result.add(filterByVisitor.translateEntity(entity));
+				if (filter != null) {
+					final Stream<Optional<AttributeValue>> valueStream = attributeValueAccessor.apply(entity, attributeName);
+					if (valueStream != null && filter.test(valueStream)) {
+						result.add(filterByVisitor.translateEntity(entity));
+					}
 				}
 			}
 			return result;