Commit 5aced98ce38ea479f23e7da9b39a09dfeff1c92c
Committed by
Andrew Shvayka
1 parent
e375124b
Fix NPE in Netty-mqtt client (#1398)
* Fix NPE in netty-mqtt client on puback * Fix gateway mqtt extension configuration - filter is not required
Showing
2 changed files
with
4 additions
and
1 deletions
... | ... | @@ -222,6 +222,9 @@ final class MqttChannelHandler extends SimpleChannelInboundHandler<MqttMessage> |
222 | 222 | |
223 | 223 | private void handlePuback(MqttPubAckMessage message) { |
224 | 224 | MqttPendingPublish pendingPublish = this.client.getPendingPublishes().get(message.variableHeader().messageId()); |
225 | + if (pendingPublish == null) { | |
226 | + return; | |
227 | + } | |
225 | 228 | pendingPublish.getFuture().setSuccess(null); |
226 | 229 | pendingPublish.onPubackReceived(); |
227 | 230 | this.client.getPendingPublishes().remove(message.variableHeader().messageId()); | ... | ... |
... | ... | @@ -261,7 +261,7 @@ |
261 | 261 | </md-input-container> |
262 | 262 | <md-input-container flex="60" class="md-block" md-is-error="theForm['mqttFilterExpression' + brokerIndex + mapIndex].$touched && theForm['mqttFilterExpression' + brokerIndex + mapIndex].$invalid"> |
263 | 263 | <label translate>extension.filter-expression</label> |
264 | - <input required name="mqttFilterExpression{{brokerIndex}}{{mapIndex}}" ng-model="map.converter.filterExpression"> | |
264 | + <input name="mqttFilterExpression{{brokerIndex}}{{mapIndex}}" ng-model="map.converter.filterExpression"> | |
265 | 265 | <div ng-messages="theForm['mqttFilterExpression' + brokerIndex + mapIndex].$error"> |
266 | 266 | <div translate ng-message="required">extension.field-required</div> |
267 | 267 | </div> | ... | ... |