From e54eb2a606c68db932b4d3b1fb2d3e3ee03f85ef Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Wed, 3 Oct 2018 21:28:37 +0300
Subject: [PATCH] Fixed exception msg

---
 .../org/thingsboard/server/dao/asset/BaseAssetService.java     | 3 ++-
 .../org/thingsboard/server/dao/device/DeviceServiceImpl.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
index f35b89069c..ebd056048b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java
@@ -54,6 +54,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
 import static org.thingsboard.server.common.data.CacheConstants.ASSET_CACHE;
@@ -141,7 +142,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ
             if (entityViews != null && !entityViews.isEmpty()) {
                 throw new DataValidationException("Can't delete asset that is assigned to entity views!");
             }
-        } catch (Exception e) {
+        } catch (ExecutionException | InterruptedException e) {
             log.error("Exception while finding entity views for assetId [{}]", assetId, e);
             throw new RuntimeException("Exception while finding entity views for assetId [" + assetId + "]", e);
         }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
index 6f9ea62244..2be5ba4f41 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
@@ -58,6 +58,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
 import static org.thingsboard.server.common.data.CacheConstants.DEVICE_CACHE;
@@ -158,7 +159,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
             if (entityViews != null && !entityViews.isEmpty()) {
                 throw new DataValidationException("Can't delete device that is assigned to entity views!");
             }
-        } catch (Exception e) {
+        } catch (ExecutionException | InterruptedException e) {
             log.error("Exception while finding entity views for deviceId [{}]", deviceId, e);
             throw new RuntimeException("Exception while finding entity views for deviceId [" + deviceId + "]", e);
         }