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

ARTEMIS-2330 Fixing Possible NPE on HQPropertiesConversionInterceptor

This commit is contained in:
Clebert Suconic 2019-05-02 19:20:40 -04:00
parent 56152a9e7c
commit 6f0380097e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/HQPropertiesConversionInterceptor.java
View File

@ -21,6 +21,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.Interceptor;
import org.apache.activemq.artemis.api.core.Message;
import org.apache.activemq.artemis.core.client.impl.ClientMessageInternal;
import org.apache.activemq.artemis.core.message.impl.CoreMessage;
import org.apache.activemq.artemis.core.protocol.core.Packet;
import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.MessagePacketI;
import org.apache.activemq.artemis.core.protocol.hornetq.util.HQPropertiesConverter;
@ -48,7 +49,9 @@ public class HQPropertiesConversionInterceptor implements Interceptor {
// there's no need to copy client messages, only the server ones are problematic
if (!(copy instanceof ClientMessageInternal)) {
copy = copy.copy();
if (copy instanceof CoreMessage && ((CoreMessage)copy).getBuffer() != null) {
copy = copy.copy();
}
messagePacket.replaceMessage(copy);
}