Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C357A200B58 for ; Wed, 27 Jul 2016 13:07:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C219C160A90; Wed, 27 Jul 2016 11:07:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1F20C160A6E for ; Wed, 27 Jul 2016 13:07:33 +0200 (CEST) Received: (qmail 33032 invoked by uid 500); 27 Jul 2016 11:07:33 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 33023 invoked by uid 99); 27 Jul 2016 11:07:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jul 2016 11:07:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D7695E02A2; Wed, 27 Jul 2016 11:07:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gtully@apache.org To: commits@activemq.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: fix intermittent ci failure w.r.t timing of initial delivery Date: Wed, 27 Jul 2016 11:07:32 +0000 (UTC) archived-at: Wed, 27 Jul 2016 11:07:34 -0000 Repository: activemq Updated Branches: refs/heads/master 6b8e743b0 -> 51b413309 fix intermittent ci failure w.r.t timing of initial delivery Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/51b41330 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/51b41330 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/51b41330 Branch: refs/heads/master Commit: 51b413309caffb776a67158432e85b3ace41f013 Parents: 6b8e743 Author: gtully Authored: Wed Jul 27 12:07:18 2016 +0100 Committer: gtully Committed: Wed Jul 27 12:07:18 2016 +0100 ---------------------------------------------------------------------- .../src/test/java/org/apache/activemq/ra/MDBTest.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/51b41330/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java index 43785f1..a078a91 100644 --- a/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java +++ b/activemq-ra/src/test/java/org/apache/activemq/ra/MDBTest.java @@ -631,12 +631,15 @@ public class MDBTest { super.onMessage(message); try { long now = System.currentTimeMillis(); - if ((now - timeReceived.getAndSet(now)) > 1000) { + if (timeReceived.get() == 0) { + timeReceived.set(now); + } + if ((now - timeReceived.getAndSet(now)) >= 1000) { failed.set(true); } messageDelivered.countDown(); if (!messageDelivered.await(1, TimeUnit.MILLISECONDS)) { - throw new RuntimeException("ex on first delivery"); + throw new RuntimeException("ex on delivery: " + messageDelivered.getCount()); } else { try { assertTrue(message.getJMSRedelivered()); @@ -694,13 +697,13 @@ public class MDBTest { } catch (Exception e) { } - timeReceived.set(System.currentTimeMillis()); + timeReceived.set(0); // Send the broker a message to that endpoint MessageProducer producer = session.createProducer(new ActiveMQQueue("TEST")); producer.send(session.createTextMessage("Hello!")); connection.close(); - // Wait for the message to be delivered twice. + // Wait for the message to be delivered. assertTrue(messageDelivered.await(10000, TimeUnit.MILLISECONDS)); assertFalse("Delivery policy delay not working", failed.get());