Fixed relation search if relationTypeGroup is null

8 years ago · f41fabf443
1 changed files with 3 additions and 0 deletions
--- a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
@ -555,6 +555,9 @@ public class BaseRelationService implements RelationService {

    private ListenableFuture<List<EntityRelation>> findRelations(final EntityId rootId, final EntitySearchDirection direction, RelationTypeGroup relationTypeGroup) {
        ListenableFuture<List<EntityRelation>> relations;
+        if (relationTypeGroup == null) {
+            relationTypeGroup = RelationTypeGroup.COMMON;
+        }
        if (direction == EntitySearchDirection.FROM) {
            relations = findByFromAsync(rootId, relationTypeGroup);
        } else {