Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 7582 invoked from network); 13 Jun 2006 14:07:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Jun 2006 14:07:51 -0000 Received: (qmail 84152 invoked by uid 500); 13 Jun 2006 14:07:49 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 84102 invoked by uid 500); 13 Jun 2006 14:07:49 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 83908 invoked by uid 99); 13 Jun 2006 14:07:44 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jun 2006 07:07:44 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jun 2006 07:07:43 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id F06F61A9842; Tue, 13 Jun 2006 07:07:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413901 - /db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java Date: Tue, 13 Jun 2006 14:07:22 -0000 To: derby-commits@db.apache.org From: tmnk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060613140722.F06F61A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: tmnk Date: Tue Jun 13 07:07:22 2006 New Revision: 413901 URL: http://svn.apache.org/viewvc?rev=413901&view=rev Log: - DERBY-1396 ReEncodedInputStream may fail to read all of source Reader - Patch by Tomohito Nakayama (tomonaka@basil.ocn.ne.jp) Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java?rev=413901&r1=413900&r2=413901&view=diff ============================================================================== --- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java (original) +++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ReEncodedInputStream.java Tue Jun 13 07:07:22 2006 @@ -72,10 +72,14 @@ throws IOException { - int count; - if(( count = reader.read(decodedBuffer_, 0, BUFFERED_CHAR_LEN )) < 1 ){ - return null; - } + int count; + do{ + count = reader.read(decodedBuffer_, 0, BUFFERED_CHAR_LEN); + + }while(count == 0); + + if(count < 0) + return null; encodedOutputStream_.reset(); encodedStreamWriter_.write(decodedBuffer_,0,count);