From bc182caa60f93dbe090f2665eb6831f26a90542a Mon Sep 17 00:00:00 2001
From: vzikratyi <vzikratyi@thingsboard.io>
Date: Mon, 27 Jul 2020 10:02:40 +0300
Subject: [PATCH] Check if str 'isParsable' before trying to parse it in
 EntityDataAdapter

---
 .../thingsboard/server/dao/sql/query/EntityDataAdapter.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java
index 9277a3bdcd..b9e1f1e790 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityDataAdapter.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.dao.sql.query;
 
+import org.apache.commons.lang3.math.NumberUtils;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.UUIDConverter;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -82,7 +83,7 @@ public class EntityDataAdapter {
         if (value != null) {
             String strVal = value.toString();
             // check number
-            if (strVal.length() > 0) {
+            if (strVal.length() > 0 && NumberUtils.isParsable(strVal)) {
                 try {
                     long longVal = Long.parseLong(strVal);
                     return Long.toString(longVal);