Commit bc182caa60f93dbe090f2665eb6831f26a90542a

Authored by vzikratyi
1 parent 6d4c54e2

Check if str 'isParsable' before trying to parse it in EntityDataAdapter

@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 */ 15 */
16 package org.thingsboard.server.dao.sql.query; 16 package org.thingsboard.server.dao.sql.query;
17 17
  18 +import org.apache.commons.lang3.math.NumberUtils;
18 import org.thingsboard.server.common.data.EntityType; 19 import org.thingsboard.server.common.data.EntityType;
19 import org.thingsboard.server.common.data.UUIDConverter; 20 import org.thingsboard.server.common.data.UUIDConverter;
20 import org.thingsboard.server.common.data.id.EntityId; 21 import org.thingsboard.server.common.data.id.EntityId;
@@ -82,7 +83,7 @@ public class EntityDataAdapter { @@ -82,7 +83,7 @@ public class EntityDataAdapter {
82 if (value != null) { 83 if (value != null) {
83 String strVal = value.toString(); 84 String strVal = value.toString();
84 // check number 85 // check number
85 - if (strVal.length() > 0) { 86 + if (strVal.length() > 0 && NumberUtils.isParsable(strVal)) {
86 try { 87 try {
87 long longVal = Long.parseLong(strVal); 88 long longVal = Long.parseLong(strVal);
88 return Long.toString(longVal); 89 return Long.toString(longVal);