Repository: activemq-artemis Updated Branches: refs/heads/master 3d3a8fada -> 4436f06f3
test fix Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/fcaef519 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fcaef519 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fcaef519 Branch: refs/heads/master Commit: fcaef51963f6d7363f9ed7f45d3236c060e5ce55 Parents: f0f431a Author: Clebert Suconic <[email protected]> Authored: Tue Jun 7 16:24:34 2016 -0400 Committer: Clebert Suconic <[email protected]> Committed: Tue Jun 7 17:03:41 2016 -0400 ---------------------------------------------------------------------- .../tests/integration/cluster/failover/FailoverTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fcaef519/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java index 229136a..ea9cb8e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java @@ -410,8 +410,13 @@ public class FailoverTest extends FailoverTestBase { session.rollback(xid); } catch (XAException e) { - //there is still an edge condition that we must deal with - session.rollback(xid); + try { + //there is still an edge condition that we must deal with + session.rollback(xid); + } + catch (Exception ignored) { + log.trace(ignored.getMessage(), ignored); + } } ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
