From de36f65dd133d189aa889f70bf380499596a310c Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 3 Nov 2002 20:27:31 +0000 Subject: GNU Classpath merge. 2002-10-31 Stephen Crawley * java/lang/Double.java (valueOf): Return new Double(parseDouble(s)). 2002-10-31 Wu Gansha : * java/util/ArrayList.java (readObject, writeObject): Only read/write size items. 2002-10-31 Wu Gansha : * java/io/DataInputStream.java (convertFromUTF): Give StringBuffer an initial estimated size to avoid enlarge buffer frequently. 2002-10-31 Wu Gansha : * java/lang/reflect/Proxy.java (ProxyType): Set loader to System ClassLoader when null. (ProxyType.hashCode): Loader null check no longer needed. (ProxyType.sameTypes): New method. (ProxyType.equals): Use new method. 2002-10-31 Mark Wielaard * java/net/URLDecoder.java (decode): Initialize Stringbuffer size to length of String. * java/net/URLEncoder.java (encode): Likewise. 2002-10-31 Mark Wielaard * java/util/zip/ZipInputStream.java (getNextEntry): Throw IOException when stream is closed. (closeEntry): Likewise. (read): Likewise. * java/util/zip/ZipOutputStream.java (putNextEntry): Throw ZipException when no entry active. (closeEntry): Likewise. (write): Likewise. From-SVN: r58772 --- libjava/java/util/zip/ZipInputStream.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/java/util/zip/ZipInputStream.java') diff --git a/libjava/java/util/zip/ZipInputStream.java b/libjava/java/util/zip/ZipInputStream.java index 710ca74c201..c9a6c0159e7 100644 --- a/libjava/java/util/zip/ZipInputStream.java +++ b/libjava/java/util/zip/ZipInputStream.java @@ -139,7 +139,7 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants public ZipEntry getNextEntry() throws IOException { if (crc == null) - throw new IllegalStateException("Closed."); + throw new IOException("Stream closed."); if (entry != null) closeEntry(); @@ -216,7 +216,7 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants public void closeEntry() throws IOException { if (crc == null) - throw new IllegalStateException("Closed."); + throw new IOException("Stream closed."); if (entry == null) return; @@ -287,7 +287,7 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants public int read(byte[] b, int off, int len) throws IOException { if (crc == null) - throw new IllegalStateException("Closed."); + throw new IOException("Stream closed."); if (entry == null) return -1; boolean finished = false; -- cgit v1.2.3