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

This commit is contained in:
Clebert Suconic 2017-11-30 09:59:35 -05:00
parent f2b5114af8 67fca940d4
commit d498cf4cc6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
View File

@ -2454,7 +2454,12 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
postOffice.route(copyMessage, tx, false, rejectDuplicate);
acknowledge(tx, ref);
if (expiry) {
acknowledge(tx, ref, AckReason.EXPIRED);
} else {
acknowledge(tx, ref);
}
}
@SuppressWarnings({"ArrayToString", "ArrayToStringConcatenation"})

1
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java
View File

@ -163,6 +163,7 @@ public class ExpiryRunnerTest extends ActiveMQTestBase {
Assert.assertNotNull(cm);
// assertEquals("m" + i, cm.getBody().getString());
}
Assert.assertEquals(100, ((Queue) server.getPostOffice().getBinding(qName).getBindable()).getMessagesExpired());
consumer.close();
}