From f41fabf44300c79994f5f18643076f2686c5ceed Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 3 Jul 2018 16:07:38 +0300
Subject: [PATCH] Fixed relation search if relationTypeGroup is null

---
 .../thingsboard/server/dao/relation/BaseRelationService.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java b/dao/src/main/java/org/thingsboard/server/dao/relation/BaseRelationService.java
index 59668c893b..9b89fe29f3 100644
--- 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 {