Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 208426235 for ; Mon, 4 Jul 2011 10:24:50 +0000 (UTC) Received: (qmail 68988 invoked by uid 500); 4 Jul 2011 10:24:49 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 68924 invoked by uid 500); 4 Jul 2011 10:24:46 -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 68917 invoked by uid 99); 4 Jul 2011 10:24:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jul 2011 10:24:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jul 2011 10:24:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 64A9A23889DE for ; Mon, 4 Jul 2011 10:24:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1142605 - /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java Date: Mon, 04 Jul 2011 10:24:20 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110704102420.64A9A23889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gtully Date: Mon Jul 4 10:24:20 2011 New Revision: 1142605 URL: http://svn.apache.org/viewvc?rev=1142605&view=rev Log: https://issues.apache.org/jira/browse/AMQ-2484,https://issues.apache.org/jira/browse/AMQ-2324: Forwarded message cannot be distributed to the original broker, Avoid stuck messages in a network of brokers - apply the new policy to two test cases Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java?rev=1142605&r1=1142604&r2=1142605&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueClientsReconnectTest.java Mon Jul 4 10:24:20 2011 @@ -67,6 +67,9 @@ public class TwoBrokerQueueClientsReconn } public void doOneClientReceivesOnly() throws Exception { + // allow immediate replay back to origin + applyRateLimitNetworkFilter(0); + // Bridge brokers bridgeBrokers(broker1, broker2); bridgeBrokers(broker2, broker1); @@ -113,6 +116,9 @@ public class TwoBrokerQueueClientsReconn } public void doOneClientReceivesOnlyAfterReconnect() throws Exception { + // allow immediate replay back to origin + applyRateLimitNetworkFilter(0); + // Bridge brokers bridgeBrokers(broker1, broker2); bridgeBrokers(broker2, broker1);