From fc95cabc7a93ac254224610cfab7b8a89859f8f0 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Mon, 9 Dec 2019 15:22:29 +0200
Subject: [PATCH] fix nullPointer from method replaceNullChars

---
 .../thingsboard/server/dao/sqlts/AbstractInsertRepository.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractInsertRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractInsertRepository.java
index a4cd67abdc..e8134ca1a1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractInsertRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/AbstractInsertRepository.java
@@ -90,7 +90,7 @@ public abstract class AbstractInsertRepository {
     }
 
     protected String replaceNullChars(String strValue) {
-        if (removeNullChars) {
+        if (removeNullChars && strValue != null) {
             return PATTERN_THREAD_LOCAL.get().matcher(strValue).replaceAll(EMPTY_STR);
         }
         return strValue;