Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA Fix MQTT trace logging NPE

This commit is contained in:
Justin Bertram 2022-04-19 12:39:56 -05:00 committed by clebertsuconic
parent 6eb78a2634
commit b5539b9da4
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
View File

@ -128,7 +128,7 @@ public class MQTTProtocolHandler extends ChannelInboundHandlerAdapter {
AuditLogger.setRemoteAddress(connection.getRemoteAddress());
}
MQTTUtil.logMessage(session.getState(), message, true);
MQTTUtil.logMessage(session.getState(), message, true, session.getVersion());
if (this.ctx == null) {
this.ctx = ctx;
@ -407,7 +407,7 @@ public class MQTTProtocolHandler extends ChannelInboundHandlerAdapter {
if (this.protocolManager.invokeOutgoing(message, connection) != null) {
return;
}
MQTTUtil.logMessage(session.getState(), message, false);
MQTTUtil.logMessage(session.getState(), message, false, session.getVersion());
ctx.writeAndFlush(message, ctx.voidPromise());
}

14
artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTUtil.java
View File

@ -244,7 +244,7 @@ public class MQTTUtil {
return message;
}
public static void logMessage(MQTTSessionState state, MqttMessage message, boolean inbound) {
public static void logMessage(MQTTSessionState state, MqttMessage message, boolean inbound, MQTTVersion version) {
if (logger.isTraceEnabled()) {
StringBuilder log = new StringBuilder("MQTT(");
@ -350,12 +350,16 @@ public class MQTTUtil {
case PUBREC:
case PUBREL:
case PUBCOMP:
MqttPubReplyMessageVariableHeader pubReplyVariableHeader = (MqttPubReplyMessageVariableHeader) message.variableHeader();
log.append(" reasonCode=").append(formatByte(pubReplyVariableHeader.reasonCode()));
if (version == MQTTVersion.MQTT_5) {
MqttPubReplyMessageVariableHeader pubReplyVariableHeader = (MqttPubReplyMessageVariableHeader) message.variableHeader();
log.append(" reasonCode=").append(formatByte(pubReplyVariableHeader.reasonCode()));
}
break;
case DISCONNECT:
MqttReasonCodeAndPropertiesVariableHeader disconnectVariableHeader = (MqttReasonCodeAndPropertiesVariableHeader) message.variableHeader();
log.append(" reasonCode=").append(formatByte(disconnectVariableHeader.reasonCode()));
if (version == MQTTVersion.MQTT_5) {
MqttReasonCodeAndPropertiesVariableHeader disconnectVariableHeader = (MqttReasonCodeAndPropertiesVariableHeader) message.variableHeader();
log.append(" reasonCode=").append(formatByte(disconnectVariableHeader.reasonCode()));
}
break;
}