Merge pull request #3997 from Coduz/fix-forwardableEntities

🐛 (commons): fixes resolution of forwardable queries on forwardable entities when predicates are null
eclipse-kapua · Mar 19, 2024 · aa54cb7 · aa54cb7
2 parents 5f48751 + 197a8b9
commit aa54cb7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...rnal/src/main/java/org/eclipse/kapua/service/utils/internal/KapuaEntityQueryUtilImpl.java b/...rnal/src/main/java/org/eclipse/kapua/service/utils/internal/KapuaEntityQueryUtilImpl.java
@@ -50,7 +50,9 @@ public KapuaQuery transformInheritedQuery(@NotNull KapuaForwardableEntityQuery q
         KapuaId scopeId = query.getScopeId();
 
         // Replacement predicate root
-        AndPredicate newPred = query.andPredicate(query.getPredicate());
+        AndPredicate newPred = query.getPredicate() != null ?
+                query.andPredicate(query.getPredicate()) :
+                query.andPredicate();
 
         // Create predicate to query ancestor accounts for entities that are forwardable
         query.setScopeId(KapuaId.ANY);