From 94f584afe10b35bbef4ee398c93a5267b0f5343a Mon Sep 17 00:00:00 2001
From: mp-loki <valerii.sosliuk@gmail.com>
Date: Tue, 15 Jan 2019 23:35:27 +0200
Subject: [PATCH] Fix NPE in netty-mqtt client on puback

---
 .../src/main/java/org/thingsboard/mqtt/MqttChannelHandler.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttChannelHandler.java b/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttChannelHandler.java
index c927c428e6..d2a1ad129e 100644
--- a/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttChannelHandler.java
+++ b/netty-mqtt/src/main/java/org/thingsboard/mqtt/MqttChannelHandler.java
@@ -222,6 +222,9 @@ final class MqttChannelHandler extends SimpleChannelInboundHandler<MqttMessage>
 
     private void handlePuback(MqttPubAckMessage message) {
         MqttPendingPublish pendingPublish = this.client.getPendingPublishes().get(message.variableHeader().messageId());
+        if (pendingPublish == null) {
+            return;
+        }
         pendingPublish.getFuture().setSuccess(null);
         pendingPublish.onPubackReceived();
         this.client.getPendingPublishes().remove(message.variableHeader().messageId());