Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E87FB9DE1 for ; Tue, 13 Mar 2012 17:03:53 +0000 (UTC) Received: (qmail 87512 invoked by uid 500); 13 Mar 2012 17:03:53 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 87456 invoked by uid 500); 13 Mar 2012 17:03:53 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 87449 invoked by uid 99); 13 Mar 2012 17:03:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2012 17:03:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Tue, 13 Mar 2012 17:03:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8D2492388860 for ; Tue, 13 Mar 2012 17:03:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1300238 - in /commons/proper/io/trunk/src: main/java/org/apache/commons/io/input/CharSequenceInputStream.java test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java Date: Tue, 13 Mar 2012 17:03:32 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120313170332.8D2492388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Tue Mar 13 17:03:32 2012 New Revision: 1300238 URL: http://svn.apache.org/viewvc?rev=1300238&view=rev Log: Fix occasional test failure - should always return 0 for read length == 0 Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java?rev=1300238&r1=1300237&r2=1300238&view=diff ============================================================================== --- commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java (original) +++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java Tue Mar 13 17:03:32 2012 @@ -117,7 +117,10 @@ public class CharSequenceInputStream ext if (len < 0 || (off + len) > b.length) { throw new IndexOutOfBoundsException("Array Size=" + b.length + ", offset=" + off + ", length=" + len); - } + } + if (len == 0) { + return 0; // must return 0 for zero length read + } if (!this.bbuf.hasRemaining() && !this.cbuf.hasRemaining()) { return -1; } Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java?rev=1300238&r1=1300237&r2=1300238&view=diff ============================================================================== --- commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java (original) +++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java Tue Mar 13 17:03:32 2012 @@ -109,6 +109,13 @@ public class CharSequenceInputStreamTest byte[] bytes = new byte[30]; assertEquals(0, r.read(bytes, 0, 0)); } + + @Test + public void testReadZeroEmptyString() throws Exception { + InputStream r = new CharSequenceInputStream("", "UTF-8"); + byte[] bytes = new byte[30]; + assertEquals(0, r.read(bytes, 0, 0)); + } @Test public void testCharsetMismatchInfiniteLoop() throws IOException {