From 2f82feee28c504aace41d79c44a7af845f35e0bb Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 22 Jun 2021 19:27:15 +0300
Subject: [PATCH] Added checks for null values. Error msg can not be null when
 setting to grpc response

---
 .../thingsboard/server/service/edge/rpc/EdgeGrpcSession.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
index 5badbd1a25..82aeab69ef 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
@@ -249,9 +249,10 @@ public final class EdgeGrpcSession implements Closeable {
 
             @Override
             public void onFailure(Throwable t) {
+                String errorMsg = t.getMessage() != null ? t.getMessage() : "";
                 UplinkResponseMsg uplinkResponseMsg = UplinkResponseMsg.newBuilder()
                         .setUplinkMsgId(uplinkMsg.getUplinkMsgId())
-                        .setSuccess(false).setErrorMsg(t.getMessage()).build();
+                        .setSuccess(false).setErrorMsg(errorMsg).build();
                 sendDownlinkMsg(ResponseMsg.newBuilder()
                         .setUplinkResponseMsg(uplinkResponseMsg)
                         .build());