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

ARTEMIS-2081 listConfiguredQueues returns only queues created by config 

Move configuration managed in persister before consumer dispatch so then the fix can be applied in 2.6.x branch safely.
This commit is contained in:
Michael André Pearce 2019-02-07 17:19:23 +00:00 committed by Justin Bertram
parent 14617936dc
commit efa48c9782
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java
View File

@ -326,6 +326,11 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
} else { } else {
lastValue = ActiveMQDefaultConfiguration.getDefaultLastValue(); lastValue = ActiveMQDefaultConfiguration.getDefaultLastValue();
} }
if (buffer.readableBytes() > 0) {
configurationManaged = buffer.readBoolean();
} else {
configurationManaged = false;
}
if (buffer.readableBytes() > 0) { if (buffer.readableBytes() > 0) {
consumersBeforeDispatch = buffer.readInt(); consumersBeforeDispatch = buffer.readInt();
} else { } else {
@ -336,11 +341,6 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
} else { } else {
delayBeforeDispatch = ActiveMQDefaultConfiguration.getDefaultDelayBeforeDispatch(); delayBeforeDispatch = ActiveMQDefaultConfiguration.getDefaultDelayBeforeDispatch();
} }
if (buffer.readableBytes() > 0) {
configurationManaged = buffer.readBoolean();
} else {
configurationManaged = false;
}
if (buffer.readableBytes() > 0) { if (buffer.readableBytes() > 0) {
lastValueKey = buffer.readNullableSimpleString(); lastValueKey = buffer.readNullableSimpleString();
} else { } else {
@ -365,9 +365,9 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
buffer.writeByte(routingType); buffer.writeByte(routingType);
buffer.writeBoolean(exclusive); buffer.writeBoolean(exclusive);
buffer.writeBoolean(lastValue); buffer.writeBoolean(lastValue);
buffer.writeBoolean(configurationManaged);
buffer.writeInt(consumersBeforeDispatch); buffer.writeInt(consumersBeforeDispatch);
buffer.writeLong(delayBeforeDispatch); buffer.writeLong(delayBeforeDispatch);
buffer.writeBoolean(configurationManaged);
buffer.writeNullableSimpleString(lastValueKey); buffer.writeNullableSimpleString(lastValueKey);
buffer.writeBoolean(nonDestructive); buffer.writeBoolean(nonDestructive);
} }
@ -382,9 +382,9 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
DataConstants.SIZE_BYTE + DataConstants.SIZE_BYTE +
DataConstants.SIZE_BOOLEAN + DataConstants.SIZE_BOOLEAN +
DataConstants.SIZE_BOOLEAN + DataConstants.SIZE_BOOLEAN +
DataConstants.SIZE_BOOLEAN +
DataConstants.SIZE_INT + DataConstants.SIZE_INT +
DataConstants.SIZE_LONG + DataConstants.SIZE_LONG +
DataConstants.SIZE_BOOLEAN +
SimpleString.sizeofNullableString(lastValueKey) + SimpleString.sizeofNullableString(lastValueKey) +
DataConstants.SIZE_BOOLEAN; DataConstants.SIZE_BOOLEAN;
} }