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 B7CFC114CE for ; Fri, 23 May 2014 15:34:23 +0000 (UTC) Received: (qmail 63574 invoked by uid 500); 23 May 2014 15:34:23 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 63530 invoked by uid 500); 23 May 2014 15:34:23 -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 63523 invoked by uid 99); 23 May 2014 15:34:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 May 2014 15:34:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 581F59A5128; Fri, 23 May 2014 15:34:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@activemq.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: https://issues.apache.org/jira/browse/AMQ-5195 Date: Fri, 23 May 2014 15:34:23 +0000 (UTC) Repository: activemq Updated Branches: refs/heads/trunk 9b6f419d4 -> ba519d8bd https://issues.apache.org/jira/browse/AMQ-5195 Use largest incoming capaity value, broker will do flow control based on destination policies. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ba519d8b Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ba519d8b Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ba519d8b Branch: refs/heads/trunk Commit: ba519d8bd3e1f17d5885a48da0b58999eebd2e12 Parents: 9b6f419 Author: Timothy Bish Authored: Fri May 23 11:26:55 2014 -0400 Committer: Timothy Bish Committed: Fri May 23 11:26:55 2014 -0400 ---------------------------------------------------------------------- .../org/apache/activemq/transport/amqp/AmqpProtocolConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/ba519d8b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java ---------------------------------------------------------------------- diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java index 36a41e6..f8e5686 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java @@ -464,7 +464,7 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter { AmqpSessionContext sessionContext = new AmqpSessionContext(connectionId, nextSessionId++); session.setContext(sessionContext); sendToActiveMQ(new SessionInfo(sessionContext.sessionId), null); - session.setIncomingCapacity(AmqpWireFormat.DEFAULT_MAX_FRAME_SIZE * prefetch); + session.setIncomingCapacity(Integer.MAX_VALUE); session.open(); }