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

https://issues.apache.org/jira/browse/AMQ-6142 

Moving the bytes copy to the parent Message class to solve this this
issue for all message types as that is the root cause

(cherry picked from commit e69c2cbad6)
This commit is contained in:
Christopher L. Shannon (cshannon) 2016-04-11 12:31:57 +00:00
parent 078da5e7f8
commit 20e84d63e0
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java
View File

@ -890,8 +890,6 @@ public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessag
Inflater inflater = new Inflater();
ByteArrayOutputStream decompressed = new ByteArrayOutputStream();
try {
//copy to prevent a race condition - AMQ-6142
dataSequence = new ByteSequence(dataSequence.getData(), dataSequence.getOffset(), dataSequence.getLength());
length = ByteSequenceData.readIntBig(dataSequence);
dataSequence.offset = 0;
byte[] data = Arrays.copyOfRange(dataSequence.getData(), 4, dataSequence.getLength());

11
activemq-client/src/main/java/org/apache/activemq/command/Message.java
View File

@ -142,8 +142,8 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess
copy.properties = properties;
}
copy.content = content;
copy.marshalledProperties = marshalledProperties;
copy.content = copyByteSequence(content);
copy.marshalledProperties = copyByteSequence(marshalledProperties);
copy.dataStructure = dataStructure;
copy.readOnlyProperties = readOnlyProperties;
copy.readOnlyBody = readOnlyBody;
@ -164,6 +164,13 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess
// copy.referenceCount = referenceCount;
}
private ByteSequence copyByteSequence(ByteSequence content) {
if (content != null) {
return new ByteSequence(content.getData(), content.getOffset(), content.getLength());
}
return null;
}
public Object getProperty(String name) throws IOException {
if (properties == null) {
if (marshalledProperties == null) {