Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 20678 invoked from network); 6 May 2009 13:44:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 May 2009 13:44:17 -0000 Received: (qmail 5676 invoked by uid 500); 6 May 2009 13:44:17 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 5652 invoked by uid 500); 6 May 2009 13:44:17 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 5641 invoked by uid 99); 6 May 2009 13:44:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 May 2009 13:44:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 06 May 2009 13:44:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1994A2388920; Wed, 6 May 2009 13:43:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r772257 - in /harmony/enhanced/classlib/trunk/modules/luni/src: main/java/java/io/BufferedInputStream.java test/api/common/org/apache/harmony/luni/tests/java/io/BufferedInputStreamTest.java Date: Wed, 06 May 2009 13:43:54 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090506134356.1994A2388920@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Wed May 6 13:43:53 2009 New Revision: 772257 URL: http://svn.apache.org/viewvc?rev=772257&view=rev Log: Apply patch for HARMONY-6134 ([classlib][luni] java.io.BufferedInputStream.reset() throws IOException after skipping the marked position) Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedInputStream.java harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedInputStreamTest.java Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedInputStream.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedInputStream.java?rev=772257&r1=772256&r2=772257&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedInputStream.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/BufferedInputStream.java Wed May 6 13:43:53 2009 @@ -416,7 +416,6 @@ pos = count; return read; } - markpos = -1; } return read + localIn.skip(amount - read); } Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedInputStreamTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedInputStreamTest.java?rev=772257&r1=772256&r2=772257&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedInputStreamTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/BufferedInputStreamTest.java Wed May 6 13:43:53 2009 @@ -429,6 +429,31 @@ } /** + * @tests java.io.BufferedInputStream#reset() + */ + public void test_reset_scenario1() throws IOException { + byte[] input = "12345678900".getBytes(); + BufferedInputStream buffis = new BufferedInputStream( + new ByteArrayInputStream(input)); + buffis.read(); + buffis.mark(5); + buffis.skip(5); + buffis.reset(); + } + + /** + * @tests java.io.BufferedInputStream#reset() + */ + public void test_reset_scenario2() throws IOException { + byte[] input = "12345678900".getBytes(); + BufferedInputStream buffis = new BufferedInputStream( + new ByteArrayInputStream(input)); + buffis.mark(5); + buffis.skip(6); + buffis.reset(); + } + + /** * @tests java.io.BufferedInputStream#skip(long) */ public void test_skipJ() throws IOException {