Repository: activemq Updated Branches: refs/heads/trunk 6c5dd2543 -> 1e5d21276
https://issues.apache.org/jira/browse/AMQ-5513 - fix stomp regression - dependency on redelivered flag between stomp and jms is tenuous - but can be reliable via policy as shown Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/1e5d2127 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/1e5d2127 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/1e5d2127 Branch: refs/heads/trunk Commit: 1e5d2127685a267ba341c90a80d575cea681523c Parents: 6c5dd25 Author: gtully <[email protected]> Authored: Tue Jan 27 15:38:16 2015 +0000 Committer: gtully <[email protected]> Committed: Tue Jan 27 15:38:16 2015 +0000 ---------------------------------------------------------------------- .../org/apache/activemq/transport/stomp/StompTest.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/1e5d2127/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java ---------------------------------------------------------------------- diff --git a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java index 33e0e55..39adc6b 100644 --- a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java +++ b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java @@ -48,6 +48,8 @@ import javax.management.ObjectName; import org.apache.activemq.broker.TransportConnector; import org.apache.activemq.broker.jmx.BrokerViewMBean; import org.apache.activemq.broker.jmx.QueueViewMBean; +import org.apache.activemq.broker.region.policy.PolicyEntry; +import org.apache.activemq.broker.region.policy.PolicyMap; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQTextMessage; import org.apache.activemq.util.Wait; @@ -120,19 +122,28 @@ public class StompTest extends StompTestSupport { + "}}"; } + queue = new ActiveMQQueue(getQueueName()); super.setUp(); stompConnect(); connection = cf.createConnection("system", "manager"); session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - queue = new ActiveMQQueue(getQueueName()); connection.start(); xstream = new XStream(); xstream.processAnnotations(SamplePojo.class); } @Override + public void applyBrokerPolicies() { + PolicyMap policyMap = new PolicyMap(); + PolicyEntry persistRedelivery = new PolicyEntry(); + persistRedelivery.setPersistJMSRedelivered(true); + policyMap.put(queue, persistRedelivery); + brokerService.setDestinationPolicy(policyMap); + } + + @Override public void tearDown() throws Exception { try { connection.close();
