jbertram commented on a change in pull request #3984:
URL: https://github.com/apache/activemq-artemis/pull/3984#discussion_r826129718
##########
File path:
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
##########
@@ -1999,46 +1989,18 @@ public void expire(final MessageReference ref, final
ServerConsumer consumer) th
refCountForConsumers.check();
if (server != null && server.hasBrokerMessagePlugins()) {
- final SimpleString expiryAddress = messageExpiryAddress;
- server.callBrokerMessagePlugins(plugin -> plugin.messageExpired(ref,
expiryAddress, consumer));
+ server.callBrokerMessagePlugins(plugin -> plugin.messageExpired(ref,
addressSettings.getExpiryAddress(), consumer));
}
}
- private SimpleString expiryAddressFromMessageAddress(MessageReference ref) {
- SimpleString messageAddress = extractAddress(ref.getMessage());
- SimpleString expiryAddress = null;
-
- if (messageAddress == null || messageAddress.equals(getAddress())) {
- expiryAddress = getExpiryAddress();
- }
-
- return expiryAddress;
- }
-
- private SimpleString expiryAddressFromAddressSettings(MessageReference ref)
{
- SimpleString messageAddress = extractAddress(ref.getMessage());
- SimpleString expiryAddress = null;
-
- if (messageAddress != null) {
- AddressSettings addressSettings =
addressSettingsRepository.getMatch(messageAddress.toString());
-
- expiryAddress = addressSettings.getExpiryAddress();
- }
-
- return expiryAddress;
- }
-
- private SimpleString extractAddress(Message message) {
- if (message.containsProperty(Message.HDR_ORIG_MESSAGE_ID.toString())) {
Review comment:
See my previous comment.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
