Return-Path: 
 <httpclient-commits-return-42-apmail-jakarta-httpclient-commits-archive=www.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-httpclient-commits-archive@www.apache.org
Received: (qmail 5001 invoked from network); 25 Mar 2005 16:19:18 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 25 Mar 2005 16:19:18 -0000
Received: (qmail 24139 invoked by uid 500); 25 Mar 2005 16:19:18 -0000
Mailing-List: contact httpclient-commits-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:httpclient-commits-help@jakarta.apache.org>
List-Unsubscribe: <mailto:httpclient-commits-unsubscribe@jakarta.apache.org>
List-Post: <mailto:httpclient-commits@jakarta.apache.org>
List-Id: <httpclient-commits.jakarta.apache.org>
Reply-To: httpclient-dev@jakarta.apache.org
Delivered-To: mailing list httpclient-commits@jakarta.apache.org
Received: (qmail 24124 invoked by uid 500); 25 Mar 2005 16:19:18 -0000
Delivered-To: apmail-jakarta-httpclient-cvs@jakarta.apache.org
Received: (qmail 24119 invoked by uid 99); 25 Mar 2005 16:19:18 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Fri, 25 Mar 2005 08:19:17 -0800
Received: (qmail 4998 invoked by uid 65534); 25 Mar 2005 16:19:16 -0000
Message-ID: <20050325161916.4997.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Fri, 25 Mar 2005 16:19:16 -0000
Subject: svn commit: r159033 -
 jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOHttpDataTransmitter.java
To: httpclient-cvs@jakarta.apache.org
From: olegk@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: olegk
Date: Fri Mar 25 08:19:15 2005
New Revision: 159033

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D159033
Log:
Fixed broken write(byte[], int, int) method

Modified:
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOH=
ttpDataTransmitter.java

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/imp=
l/NIOHttpDataTransmitter.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src=
/java/org/apache/http/impl/NIOHttpDataTransmitter.java?view=3Ddiff&r1=3D159=
032&r2=3D159033
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOH=
ttpDataTransmitter.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/NIOH=
ttpDataTransmitter.java Fri Mar 25 08:19:15 2005
@@ -120,15 +120,19 @@
         if (b =3D=3D null) {
             return;
         }
-        int i =3D off;
-        while (i < len) {
+        int remaining =3D len;
+        while (remaining > 0) {
             if (this.buffer.hasRemaining()) {
-                int chunk =3D len - i;
+                int chunk =3D len;
+                if (chunk > remaining) {
+                    chunk =3D remaining;
+                }
                 if (chunk > this.buffer.remaining()) {
                     chunk =3D this.buffer.remaining();
                 }
-                this.buffer.put(b, i, chunk);
-                i +=3D chunk;
+                this.buffer.put(b, off, chunk);
+                off +=3D chunk;
+                remaining -=3D chunk;=20
             } else {
                 flushBuffer();
             }