Return-Path: Delivered-To: apmail-incubator-qpid-commits-archive@locus.apache.org Received: (qmail 56765 invoked from network); 7 Mar 2008 15:35:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Mar 2008 15:35:29 -0000 Received: (qmail 93245 invoked by uid 500); 7 Mar 2008 15:35:25 -0000 Delivered-To: apmail-incubator-qpid-commits-archive@incubator.apache.org Received: (qmail 93230 invoked by uid 500); 7 Mar 2008 15:35:25 -0000 Mailing-List: contact qpid-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: qpid-dev@incubator.apache.org Delivered-To: mailing list qpid-commits@incubator.apache.org Received: (qmail 93221 invoked by uid 99); 7 Mar 2008 15:35:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Mar 2008 07:35:25 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Mar 2008 15:34:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 61BC81A9832; Fri, 7 Mar 2008 07:35:08 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r634717 - /incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java Date: Fri, 07 Mar 2008 15:35:08 -0000 To: qpid-commits@incubator.apache.org From: rgodfrey@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080307153508.61BC81A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rgodfrey Date: Fri Mar 7 07:35:07 2008 New Revision: 634717 URL: http://svn.apache.org/viewvc?rev=634717&view=rev Log: QPID-839 : Fixed the hanging issue with this test; as yet unable to reproduce the test failure Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java?rev=634717&r1=634716&r2=634717&view=diff ============================================================================== --- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java (original) +++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java Fri Mar 7 07:35:07 2008 @@ -82,8 +82,11 @@ consumer.setMessageListener(new MessageListener() { + int _msgCount = 0; + public void onMessage(Message message) { + _msgCount++; if (message == null) { fail("Should not get null messages"); @@ -98,12 +101,22 @@ assertEquals("The queue should have 4999 msgs left", 4999, getMessageCount(_queue.getQueueName())); }*/ - if (message.getIntProperty("count") == 9999) + if (message.getIntProperty("count") == MSG_COUNT) { - assertEquals("The queue should have 0 msgs left", 0, getMessageCount(_queue.getQueueName())); + try + { + int remainingMessages = getMessageCount(_queue.getQueueName()); + if(remainingMessages != 0) + { - //This is the last message so release test. - _awaitCompletion.countDown(); + assertEquals("The queue should have 0 msgs left, seen " + _msgCount + " messages.", 0, getMessageCount(_queue.getQueueName())); + } + } + finally + { + //This is the last message so release test. + _awaitCompletion.countDown(); + } } }