Repository: activemq Updated Branches: refs/heads/master c4a134687 -> 35f30102a
[AMQ-2100] fix for intermittent ci failure Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/35f30102 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/35f30102 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/35f30102 Branch: refs/heads/master Commit: 35f30102a6d2083bd640f86f30abffc536863458 Parents: c4a1346 Author: gtully <gary.tu...@gmail.com> Authored: Wed May 3 12:31:09 2017 +0100 Committer: gtully <gary.tu...@gmail.com> Committed: Wed May 3 12:31:09 2017 +0100 ---------------------------------------------------------------------- .../src/test/java/org/apache/activemq/JMSConsumerTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/35f30102/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java index 8785acb..5ccf1bd 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import javax.jms.BytesMessage; +import javax.jms.IllegalStateException; import javax.jms.JMSException; import javax.jms.DeliveryMode; import javax.jms.Message; @@ -161,7 +162,9 @@ public class JMSConsumerTest extends JmsTestSupport { if (count % 200 == 0) { // ensure there are some outstanding messages // ack every 200 - message.acknowledge(); + try { + message.acknowledge(); + } catch (IllegalStateException okForAck) {} } } catch (Exception e) { LOG.error("Exception on close or ack:", e);
