From 7fa1ca365b0b60f8de9376c3bf2edfd60c5d4f90 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Tue, 12 Jul 2022 19:51:25 +0300
Subject: [PATCH] Remove transactional for delete tenant since it conflicts
 with the cache implementation

---
 .../dao/service/validator/DeviceProfileDataValidator.java       | 2 +-
 .../org/thingsboard/server/dao/tenant/TenantServiceImpl.java    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
index 9ebc8e96cc..c767c3cbcd 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
@@ -126,7 +126,7 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
                 throw new DataValidationException("Another default device profile is present in scope of current tenant!");
             }
         }
-        if (deviceProfile.getDefaultQueueName() != null) {
+        if (StringUtils.isNotEmpty(deviceProfile.getDefaultQueueName())) {
             Queue queue = queueService.findQueueByTenantIdAndName(tenantId, deviceProfile.getDefaultQueueName());
             if (queue == null) {
                 throw new DataValidationException("Device profile is referencing to non-existent queue!");
diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
index 058a24c856..866150e679 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
@@ -171,7 +171,6 @@ public class TenantServiceImpl extends AbstractCachedEntityService<TenantId, Ten
     }
 
     @Override
-    @Transactional(timeout = 60 * 60)
     public void deleteTenant(TenantId tenantId) {
         log.trace("Executing deleteTenant [{}]", tenantId);
         Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);