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 #2044

This commit is contained in:
Clebert Suconic 2018-04-26 09:38:58 -04:00
parent e7f2dd39ac 5b6a8d2b59
commit 27c0017dd9
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/ActiveMQServerPlugin.java
View File

@ -566,7 +566,7 @@ public interface ActiveMQServerPlugin {
* @throws ActiveMQException * @throws ActiveMQException
*/ */
default void messageExpired(MessageReference message, SimpleString messageExpiryAddress, ServerConsumer consumer) throws ActiveMQException { default void messageExpired(MessageReference message, SimpleString messageExpiryAddress, ServerConsumer consumer) throws ActiveMQException {
messageExpired(message, messageExpiryAddress);
} }
/** /**

11
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/LoggingActiveMQServerPlugin.java
View File

@ -595,15 +595,10 @@ public class LoggingActiveMQServerPlugin implements ActiveMQServerPlugin, Serial
} }
} }
/**
* A message has been expired
*
* @param message The expired message
* @param messageExpiryAddress The message expiry address if exists
* @throws ActiveMQException
*/
@Override @Override
public void messageExpired(MessageReference message, SimpleString messageExpiryAddress) throws ActiveMQException { public void messageExpired(MessageReference message,
SimpleString messageExpiryAddress,
ServerConsumer consumer) {
if (logAll || logInternalEvents) { if (logAll || logInternalEvents) {
LoggingActiveMQServerPluginLogger.LOGGER.messageExpired(message, messageExpiryAddress); LoggingActiveMQServerPluginLogger.LOGGER.messageExpired(message, messageExpiryAddress);
} }

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/plugin/impl/NotificationActiveMQServerPlugin.java
View File

@ -139,7 +139,9 @@ public class NotificationActiveMQServerPlugin implements ActiveMQServerPlugin {
} }
@Override @Override
public void messageExpired(MessageReference message, SimpleString messageExpiryAddress) throws ActiveMQException { public void messageExpired(MessageReference message,
SimpleString messageExpiryAddress,
ServerConsumer consumer) {
final ManagementService managementService = getManagementService(); final ManagementService managementService = getManagementService();
if (managementService != null && sendExpiredNotifications) { if (managementService != null && sendExpiredNotifications) {