From 56067b0077074c026b8ad099a74292a2becd6278 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 27 Jun 2000 21:27:50 +0000 Subject: PushbackInputStream.java (read): If there are characters in the buffer, don't also call super.read(). * java/io/PushbackInputStream.java (read): If there are characters in the buffer, don't also call super.read(). * java/io/PushbackReader.java (read): If there are characters in the buffer, don't also call super.read(). From-SVN: r34745 --- libjava/java/io/PushbackReader.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'libjava/java/io/PushbackReader.java') diff --git a/libjava/java/io/PushbackReader.java b/libjava/java/io/PushbackReader.java index d5d8d441258..1a7523d0d15 100644 --- a/libjava/java/io/PushbackReader.java +++ b/libjava/java/io/PushbackReader.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -79,10 +79,14 @@ public class PushbackReader extends FilterReader throw new ArrayIndexOutOfBoundsException(); int numBytes = Math.min(buf.length - pos, len); - for (int i = 0; i < numBytes; i++) - b[off++] = buf[pos++]; - - return numBytes + super.read(b, off, len - numBytes); + if (numBytes > 0) + { + System.arraycopy (buf, pos, b, off, numBytes); + pos += numBytes; + return numBytes; + } + + return super.read(b, off, len); } } -- cgit v1.2.3