Repository: activemq Updated Branches: refs/heads/master c5579ff73 -> 3348ade99
https://issues.apache.org/jira/browse/AMQ-5914 Ensure a new pull request is sent, adds test. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3348ade9 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3348ade9 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3348ade9 Branch: refs/heads/master Commit: 3348ade99b2be00eb5452785a1325afc2a39b066 Parents: c5579ff Author: Timothy Bish <[email protected]> Authored: Mon Aug 3 14:38:54 2015 -0400 Committer: Timothy Bish <[email protected]> Committed: Mon Aug 3 14:41:56 2015 -0400 ---------------------------------------------------------------------- .../activemq/ActiveMQMessageConsumer.java | 1 + .../org/apache/activemq/bugs/AMQ5914Test.java | 129 +++++++++++++++++++ 2 files changed, 130 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/3348ade9/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java index 4584362..45232e5 100755 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java @@ -499,6 +499,7 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC if (timeout > 0) { timeout = Math.max(deadline - System.currentTimeMillis(), 0); } + sendPullCommand(timeout); } else if (redeliveryExceeded(md)) { LOG.debug("{} received with excessive redelivered: {}", getConsumerId(), md); posionAck(md, "dispatch to " + getConsumerId() + " exceeds redelivery policy limit:" + redeliveryPolicy); http://git-wip-us.apache.org/repos/asf/activemq/blob/3348ade9/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5914Test.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5914Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5914Test.java new file mode 100644 index 0000000..0d5a567 --- /dev/null +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5914Test.java @@ -0,0 +1,129 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq.bugs; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.TextMessage; + +import org.apache.activemq.ActiveMQConnection; +import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.region.policy.PolicyEntry; +import org.apache.activemq.broker.region.policy.PolicyMap; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestName; + +public class AMQ5914Test { + + private ActiveMQConnection connection; + private BrokerService broker; + private String connectionUri; + + @Rule + public TestName name = new TestName(); + + @Before + public void setUp() throws Exception { + createBroker(); + + connection = createConnection(); + } + + @After + public void tearDown() throws Exception { + if (connection != null) { + try { + connection.close(); + } catch (Exception e) {} + } + + if (broker != null) { + broker.stop(); + broker.waitUntilStopped(); + } + } + + @Test(timeout=20000) + public void testConsumerReceivePrefetchZeroMessageExpiredInFlight() throws Exception { + + connection.start(); + connection.getPrefetchPolicy().setAll(0); + + Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + Queue queue = session.createQueue(name.getMethodName()); + MessageProducer producer = session.createProducer(queue); + TextMessage expiredMessage = session.createTextMessage("expired message"); + TextMessage validMessage = session.createTextMessage("valid message"); + producer.send(expiredMessage, Message.DEFAULT_DELIVERY_MODE, Message.DEFAULT_PRIORITY, 50); + producer.send(validMessage); + session.close(); + + session = connection.createSession(true, Session.SESSION_TRANSACTED); + MessageConsumer consumer = session.createConsumer(queue); + Message message = consumer.receive(3000); + assertNotNull(message); + TextMessage received = (TextMessage) message; + assertEquals("expired message", received.getText()); + + // Rollback allow the first message to expire. + session.rollback(); + Thread.sleep(75); + + // Consume again, this should fetch the second valid message via a pull. + message = consumer.receive(3000); + assertNotNull(message); + received = (TextMessage) message; + assertEquals("valid message", received.getText()); + } + + private void createBroker() throws Exception { + + PolicyMap policyMap = new PolicyMap(); + PolicyEntry defaultEntry = new PolicyEntry(); + defaultEntry.setExpireMessagesPeriod(60000); + defaultEntry.setUseCache(false); + policyMap.setDefaultEntry(defaultEntry); + + broker = new BrokerService(); + broker.setUseJmx(false); + broker.setPersistent(false); + broker.setDestinationPolicy(policyMap); + broker.addConnector("tcp://localhost:0"); + broker.start(); + broker.waitUntilStarted(); + + connectionUri = broker.getTransportConnectors().get(0).getPublishableConnectString(); + } + + protected ActiveMQConnectionFactory createConnectionFactory() throws Exception { + return new ActiveMQConnectionFactory(connectionUri); + } + + protected ActiveMQConnection createConnection() throws Exception { + return (ActiveMQConnection) createConnectionFactory().createConnection(); + } +}
