Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 91967 invoked from network); 21 Mar 2006 16:07:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Mar 2006 16:07:29 -0000 Received: (qmail 55384 invoked by uid 500); 21 Mar 2006 16:07:22 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 55356 invoked by uid 500); 21 Mar 2006 16:07:21 -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 55336 invoked by uid 99); 21 Mar 2006 16:07:21 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Mar 2006 08:07:21 -0800 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; Tue, 21 Mar 2006 08:07:20 -0800 Received: (qmail 91684 invoked by uid 65534); 21 Mar 2006 16:07:00 -0000 Message-ID: <20060321160700.91683.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r387559 - /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java Date: Tue, 21 Mar 2006 16:06:58 -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: Tue Mar 21 08:06:57 2006 New Revision: 387559 URL: http://svn.apache.org/viewcvs?rev=387559&view=rev Log: flowControlSleepTime was not used. Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java?rev=387559&r1=387558&r2=387559&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java Tue Mar 21 08:06:57 2006 @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; + import javax.jms.Connection; import javax.jms.ConnectionConsumer; import javax.jms.ConnectionMetaData; @@ -42,6 +43,7 @@ import javax.jms.TopicConnection; import javax.jms.TopicSession; import javax.jms.XAConnection; + import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMessage; import org.apache.activemq.command.ActiveMQTempDestination; @@ -70,7 +72,6 @@ import org.apache.activemq.management.StatsCapable; import org.apache.activemq.management.StatsImpl; import org.apache.activemq.thread.TaskRunnerFactory; -import org.apache.activemq.transport.DefaultTransportListener; import org.apache.activemq.transport.Transport; import org.apache.activemq.transport.TransportListener; import org.apache.activemq.util.IdGenerator; @@ -80,6 +81,7 @@ import org.apache.activemq.util.ServiceSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; @@ -119,7 +121,6 @@ private boolean useRetroactiveConsumer; private int closeTimeout = 15000; - private long flowControlSleepTime = 0; private final JMSConnectionStatsImpl stats; private final JMSStatsImpl factoryStats; private final Transport transport; @@ -1083,13 +1084,6 @@ throw new ConnectionClosedException(); } else { - if (command.isMessage() && flowControlSleepTime > 0) { - try { - Thread.sleep(flowControlSleepTime); - } catch (InterruptedException e) { - } - } - try { this.transport.oneway(command); } catch (IOException e) { @@ -1110,13 +1104,6 @@ throw new ConnectionClosedException(); } else { - if (command.isMessage() && flowControlSleepTime > 0) { - try { - Thread.sleep(flowControlSleepTime); - } catch (InterruptedException e) { - } - } - try { Response response = this.transport.request(command); if (response.isException()) { @@ -1144,13 +1131,6 @@ if (isClosed()) { throw new ConnectionClosedException(); } else { - - if (command.isMessage() && flowControlSleepTime > 0) { - try { - Thread.sleep(flowControlSleepTime); - } catch (InterruptedException e) { - } - } try { Response response = this.transport.request(command,timeout);