Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 97785 invoked from network); 10 Apr 2006 22:30:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Apr 2006 22:30:08 -0000 Received: (qmail 4642 invoked by uid 500); 10 Apr 2006 22:30:08 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 4625 invoked by uid 500); 10 Apr 2006 22:30:07 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 4616 invoked by uid 99); 10 Apr 2006 22:30:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Apr 2006 15:30:07 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 10 Apr 2006 15:30:07 -0700 Received: (qmail 97558 invoked by uid 65534); 10 Apr 2006 22:29:46 -0000 Message-ID: <20060410222946.97557.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r393106 - in /incubator/activemq/trunk/activemq-core/src: main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java Date: Mon, 10 Apr 2006 22:29:46 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chirino Date: Mon Apr 10 15:29:40 2006 New Revision: 393106 URL: http://svn.apache.org/viewcvs?rev=393106&view=rev Log: The JMSDurableTopicRedeliverTest was failing intermitently. Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java?rev=393106&r1=393105&r2=393106&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java Mon Apr 10 15:29:40 2006 @@ -107,8 +107,8 @@ pending.addFirst(node); } else { node.decrementReferenceCount(); - iter.remove(); } + iter.remove(); } if( !keepDurableSubsActive ) { Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java?rev=393106&r1=393105&r2=393106&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java Mon Apr 10 15:29:40 2006 @@ -32,15 +32,14 @@ durable = true; super.setUp(); } - - + /** * Sends and consumes the messages. * * @throws Exception */ public void testRedeliverNewSession() throws Exception { - String text = "TEST"; + String text = "TEST: "+System.currentTimeMillis(); Message sendMessage = session.createTextMessage(text); if (verbose) { @@ -74,6 +73,6 @@ consumeSession = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE); consumer = createConsumer(); - assertNull(consumer.receiveNoWait()); + assertNull(consumer.receive(1000)); } }