Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 5134 invoked from network); 17 Feb 2011 15:28:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Feb 2011 15:28:57 -0000 Received: (qmail 2684 invoked by uid 500); 17 Feb 2011 15:28:57 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 2627 invoked by uid 500); 17 Feb 2011 15:28:55 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 2620 invoked by uid 99); 17 Feb 2011 15:28:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Feb 2011 15:28:54 +0000 X-ASF-Spam-Status: No, hits=-1999.4 required=5.0 tests=ALL_TRUSTED,HK_RANDOM_ENVFROM 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; Thu, 17 Feb 2011 15:28:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 152842388A02; Thu, 17 Feb 2011 15:28:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1071641 - /qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java Date: Thu, 17 Feb 2011 15:28:34 -0000 To: commits@qpid.apache.org From: grkvlt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110217152834.152842388A02@eris.apache.org> Author: grkvlt Date: Thu Feb 17 15:28:33 2011 New Revision: 1071641 URL: http://svn.apache.org/viewvc?rev=1071641&view=rev Log: QPID-3065: Send header and frame data as single buffer The Disassembler now fills a ByteBuffer with the entire frame contents before passing it to the Sender. Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java?rev=1071641&r1=1071640&r2=1071641&view=diff ============================================================================== --- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java (original) +++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java Thu Feb 17 15:28:33 2011 @@ -101,20 +101,23 @@ public final class Disassembler implemen { synchronized (sendlock) { - header.put(0, flags); - header.put(1, type); - header.putShort(2, (short) (size + HEADER_SIZE)); - header.put(5, track); - header.putShort(6, (short) channel); - - header.rewind(); - - sender.send(header); + ByteBuffer data = ByteBuffer.allocate(size + HEADER_SIZE); + data.order(ByteOrder.BIG_ENDIAN); + + data.put(0, flags); + data.put(1, type); + data.putShort(2, (short) (size + HEADER_SIZE)); + data.put(5, track); + data.putShort(6, (short) channel); + data.position(HEADER_SIZE); int limit = buf.limit(); buf.limit(buf.position() + size); - sender.send(buf); + data.put(buf); buf.limit(limit); + + data.rewind(); + sender.send(data); } } --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org