From 4e71935d27ca12d6ffc630d2175e166d9bcbc4ad Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Thu, 18 Jul 2019 19:34:27 +0300
Subject: [PATCH] Fix NPE in transport service.

---
 .../common/transport/service/AbstractTransportService.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/AbstractTransportService.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/AbstractTransportService.java
index 239a461cb1..d8912c18fb 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/AbstractTransportService.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/AbstractTransportService.java
@@ -200,7 +200,7 @@ public abstract class AbstractTransportService implements TransportService {
     @Override
     public void deregisterSession(TransportProtos.SessionInfoProto sessionInfo) {
         SessionMetaData currentSession = sessions.get(toId(sessionInfo));
-        if (currentSession.hasScheduledFuture()) {
+        if (currentSession != null && currentSession.hasScheduledFuture()) {
             log.debug("Stopping scheduler to avoid resending response if request has been ack.");
             currentSession.getScheduledFuture().cancel(false);
         }