Fixed NPE while logging an unknown packet (Replaced with an IOException)
This commit is contained in:
@@ -28,6 +28,8 @@ import org.slf4j.LoggerFactory;
|
|||||||
import static io.netty.channel.ChannelFutureListener.CLOSE_ON_FAILURE;
|
import static io.netty.channel.ChannelFutureListener.CLOSE_ON_FAILURE;
|
||||||
import static io.netty.handler.codec.mqtt.MqttQoS.AT_MOST_ONCE;
|
import static io.netty.handler.codec.mqtt.MqttQoS.AT_MOST_ONCE;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
@Sharable
|
@Sharable
|
||||||
public class NettyMQTTHandler extends ChannelInboundHandlerAdapter {
|
public class NettyMQTTHandler extends ChannelInboundHandlerAdapter {
|
||||||
|
|
||||||
@@ -39,8 +41,11 @@ public class NettyMQTTHandler extends ChannelInboundHandlerAdapter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelRead(ChannelHandlerContext ctx, Object message) {
|
public void channelRead(ChannelHandlerContext ctx, Object message) throws Exception {
|
||||||
MqttMessage msg = (MqttMessage) message;
|
MqttMessage msg = (MqttMessage) message;
|
||||||
|
if (msg.fixedHeader() == null) {
|
||||||
|
throw new IOException("Unknown packet");
|
||||||
|
}
|
||||||
MqttMessageType messageType = msg.fixedHeader().messageType();
|
MqttMessageType messageType = msg.fixedHeader().messageType();
|
||||||
LOG.debug("Processing MQTT message, type: {}", messageType);
|
LOG.debug("Processing MQTT message, type: {}", messageType);
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import io.netty.handler.codec.mqtt.*;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import static io.moquette.spi.impl.Utils.messageId;
|
import static io.moquette.spi.impl.Utils.messageId;
|
||||||
@@ -40,16 +41,19 @@ public class MQTTMessageLogger extends ChannelDuplexHandler {
|
|||||||
private static final Logger LOG = LoggerFactory.getLogger("messageLogger");
|
private static final Logger LOG = LoggerFactory.getLogger("messageLogger");
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void channelRead(ChannelHandlerContext ctx, Object message) {
|
public void channelRead(ChannelHandlerContext ctx, Object message) throws Exception {
|
||||||
logMQTTMessage(ctx, message, "C->B");
|
logMQTTMessage(ctx, message, "C->B");
|
||||||
ctx.fireChannelRead(message);
|
ctx.fireChannelRead(message);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void logMQTTMessage(ChannelHandlerContext ctx, Object message, String direction) {
|
private void logMQTTMessage(ChannelHandlerContext ctx, Object message, String direction) throws Exception {
|
||||||
if (!(message instanceof MqttMessage)) {
|
if (!(message instanceof MqttMessage)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MqttMessage msg = (MqttMessage) message;
|
MqttMessage msg = (MqttMessage) message;
|
||||||
|
if (msg.fixedHeader() == null) {
|
||||||
|
throw new IOException("Unknown packet");
|
||||||
|
}
|
||||||
String clientID = NettyUtils.clientID(ctx.channel());
|
String clientID = NettyUtils.clientID(ctx.channel());
|
||||||
MqttMessageType messageType = msg.fixedHeader().messageType();
|
MqttMessageType messageType = msg.fixedHeader().messageType();
|
||||||
switch (messageType) {
|
switch (messageType) {
|
||||||
|
|||||||
Reference in New Issue
Block a user