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

This closes #2335

This commit is contained in:
Justin Bertram 2018-09-26 15:41:10 -05:00
parent 10ecb358cb 8ab3be71a3
commit 5a600114b4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
View File

@ -551,12 +551,16 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage {
*/ */
protected TypedProperties checkProperties() { protected TypedProperties checkProperties() {
if (properties == null) { if (properties == null) {
TypedProperties properties = new TypedProperties(); synchronized (this) {
if (buffer != null && propertiesLocation >= 0) { if (properties == null) {
final ByteBuf byteBuf = buffer.duplicate().readerIndex(propertiesLocation); TypedProperties properties = new TypedProperties();
properties.decode(byteBuf, coreMessageObjectPools == null ? null : coreMessageObjectPools.getPropertiesDecoderPools()); if (buffer != null && propertiesLocation >= 0) {
final ByteBuf byteBuf = buffer.duplicate().readerIndex(propertiesLocation);
properties.decode(byteBuf, coreMessageObjectPools == null ? null : coreMessageObjectPools.getPropertiesDecoderPools());
}
this.properties = properties;
}
} }
this.properties = properties;
} }
return this.properties; return this.properties;