mirror of https://github.com/apache/activemq.git
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:
parent
078da5e7f8
commit
20e84d63e0
|
@ -890,8 +890,6 @@ public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessag
|
||||||
Inflater inflater = new Inflater();
|
Inflater inflater = new Inflater();
|
||||||
ByteArrayOutputStream decompressed = new ByteArrayOutputStream();
|
ByteArrayOutputStream decompressed = new ByteArrayOutputStream();
|
||||||
try {
|
try {
|
||||||
//copy to prevent a race condition - AMQ-6142
|
|
||||||
dataSequence = new ByteSequence(dataSequence.getData(), dataSequence.getOffset(), dataSequence.getLength());
|
|
||||||
length = ByteSequenceData.readIntBig(dataSequence);
|
length = ByteSequenceData.readIntBig(dataSequence);
|
||||||
dataSequence.offset = 0;
|
dataSequence.offset = 0;
|
||||||
byte[] data = Arrays.copyOfRange(dataSequence.getData(), 4, dataSequence.getLength());
|
byte[] data = Arrays.copyOfRange(dataSequence.getData(), 4, dataSequence.getLength());
|
||||||
|
|
|
@ -142,8 +142,8 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess
|
||||||
copy.properties = properties;
|
copy.properties = properties;
|
||||||
}
|
}
|
||||||
|
|
||||||
copy.content = content;
|
copy.content = copyByteSequence(content);
|
||||||
copy.marshalledProperties = marshalledProperties;
|
copy.marshalledProperties = copyByteSequence(marshalledProperties);
|
||||||
copy.dataStructure = dataStructure;
|
copy.dataStructure = dataStructure;
|
||||||
copy.readOnlyProperties = readOnlyProperties;
|
copy.readOnlyProperties = readOnlyProperties;
|
||||||
copy.readOnlyBody = readOnlyBody;
|
copy.readOnlyBody = readOnlyBody;
|
||||||
|
@ -164,6 +164,13 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess
|
||||||
// copy.referenceCount = referenceCount;
|
// 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 {
|
public Object getProperty(String name) throws IOException {
|
||||||
if (properties == null) {
|
if (properties == null) {
|
||||||
if (marshalledProperties == null) {
|
if (marshalledProperties == null) {
|
||||||
|
|
Loading…
Reference in New Issue