Added checks for null values. Error msg can not be null when setting to grpc response

5 years ago · 2f82feee28
1 changed files with 2 additions and 1 deletions
--- 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());