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

This commit is contained in:
Clebert Suconic 2019-09-11 09:41:38 -04:00
parent a8d68d9dd7 793a45f35a
commit 02d3384b87
2 changed files with 16 additions and 18 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/server/impl/QueueImpl.java
View File

@ -2745,9 +2745,6 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
logger.trace("Reference " + ref + " being expired");
}
removeMessageReference(holder, ref);
handled++;
consumers.reset();
continue;
@ -2778,8 +2775,9 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
deliveriesInTransit.countUp();
removeMessageReference(holder, ref);
if (!nonDestructive) {
removeMessageReference(holder, ref);
}
ref.setInDelivery(true);
handledconsumer = consumer;
handled++;
@ -2836,10 +2834,8 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
}
protected void removeMessageReference(ConsumerHolder<? extends Consumer> holder, MessageReference ref) {
if (!nonDestructive) {
holder.iter.remove();
refRemoved(ref);
}
holder.iter.remove();
refRemoved(ref);
}
private void checkDepage() {

20
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSNonDestructiveTest.java
View File

@ -53,14 +53,16 @@ public class JMSNonDestructiveTest extends JMSClientTestSupport {
private ConnectionSupplier CoreConnection = () -> createCoreConnection();
protected final boolean persistenceEnabled;
protected final long scanPeriod;
public JMSNonDestructiveTest(boolean persistenceEnabled) {
public JMSNonDestructiveTest(boolean persistenceEnabled, long scanPeriod) {
this.persistenceEnabled = persistenceEnabled;
this.scanPeriod = scanPeriod;
}
@Parameterized.Parameters(name = "persistenceEnabled={0}")
@Parameterized.Parameters(name = "persistenceEnabled={0}, scanPeriod={1}")
public static Collection<Object[]> data() {
Object[][] params = new Object[][]{{false}, {true}};
Object[][] params = new Object[][]{{false, 100}, {true, 100}, {true, -1}};
return Arrays.asList(params);
}
@ -72,7 +74,7 @@ public class JMSNonDestructiveTest extends JMSClientTestSupport {
@Override
protected void addConfiguration(ActiveMQServer server) {
server.getConfiguration().setPersistenceEnabled(persistenceEnabled);
server.getConfiguration().setMessageExpiryScanPeriod(100);
server.getConfiguration().setMessageExpiryScanPeriod(scanPeriod);
server.getAddressSettingsRepository().addMatch(NON_DESTRUCTIVE_QUEUE_NAME, new AddressSettings().setDefaultNonDestructive(true));
server.getAddressSettingsRepository().addMatch(NON_DESTRUCTIVE_EXPIRY_QUEUE_NAME, new AddressSettings().setDefaultNonDestructive(true).setExpiryDelay(100L));
server.getAddressSettingsRepository().addMatch(NON_DESTRUCTIVE_LVQ_QUEUE_NAME, new AddressSettings().setDefaultLastValueQueue(true).setDefaultNonDestructive(true));
@ -330,7 +332,7 @@ public class JMSNonDestructiveTest extends JMSClientTestSupport {
assertNotNull(msg);
assertEquals(Integer.toString(j), msg.getText());
}
TextMessage msg = (TextMessage) consumer.receive(200);
TextMessage msg = (TextMessage) consumer.receiveNoWait();
assertNull(msg);
consumer.close();
}
@ -354,7 +356,7 @@ public class JMSNonDestructiveTest extends JMSClientTestSupport {
Session consumerSession = consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue consumerQueue = consumerSession.createQueue(queueName);
MessageConsumer consumer = consumerSession.createConsumer(consumerQueue);
TextMessage msg = (TextMessage) consumer.receive(2000);
TextMessage msg = (TextMessage) consumer.receiveNoWait();
assertNull(msg);
consumer.close();
}
@ -393,9 +395,9 @@ public class JMSNonDestructiveTest extends JMSClientTestSupport {
assertEquals(Integer.toString(j), msg.getText());
assertEquals(Integer.toString(j), msg2.getText());
}
TextMessage msg = (TextMessage) consumer.receive(200);
TextMessage msg = (TextMessage) consumer.receiveNoWait();
assertNull(msg);
TextMessage msg2 = (TextMessage) consumer2.receive(200);
TextMessage msg2 = (TextMessage) consumer2.receiveNoWait();
assertNull(msg2);
consumer.close();
consumer2.close();
@ -466,7 +468,7 @@ public class JMSNonDestructiveTest extends JMSClientTestSupport {
try (Connection connection = consumerConnectionSupplier.createConnection();
Session session = connection.createSession();
MessageConsumer consumer = session.createConsumer(session.createQueue(queueName))) {
TextMessage msg = (TextMessage) consumer.receive(1000);
TextMessage msg = (TextMessage) consumer.receiveNoWait();
assertNull(msg);
}
}