[kaffe] CVS kaffe (doogie): If we can't find the entry, return null for the input stream.
Kaffe CVS
cvs-commits at kaffe.org
Fri Dec 24 13:08:42 PST 2004
PatchSet 5722
Date: 2004/12/24 21:04:28
Author: doogie
Branch: HEAD
Tag: (none)
Log:
If we can't find the entry, return null for the input stream.
Members:
ChangeLog:1.3267->1.3268
libraries/javalib/java/util/zip/ZipFile.java:1.14->1.15
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3267 kaffe/ChangeLog:1.3268
--- kaffe/ChangeLog:1.3267 Thu Dec 23 21:58:10 2004
+++ kaffe/ChangeLog Fri Dec 24 21:04:28 2004
@@ -1,3 +1,8 @@
+2004-12-24 Adam Heath <doogie at brainfood.com>
+
+ * libraries/javalib/java/util/zip/ZipFile.java:
+ If we can't find the entry, return null for the input stream.
+
2004-12-23 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/javax/swing/plaf/metal/MetalTheme.java:
Index: kaffe/libraries/javalib/java/util/zip/ZipFile.java
diff -u kaffe/libraries/javalib/java/util/zip/ZipFile.java:1.14 kaffe/libraries/javalib/java/util/zip/ZipFile.java:1.15
--- kaffe/libraries/javalib/java/util/zip/ZipFile.java:1.14 Mon Mar 22 11:25:13 2004
+++ kaffe/libraries/javalib/java/util/zip/ZipFile.java Fri Dec 24 21:04:27 2004
@@ -99,6 +99,10 @@
ze = getEntry(ze.getName());
}
+ if (ze == null) {
+ return null;
+ }
+
byte[] buf = getZipData0(zip, ze);
if (buf == null) {
throw new ZipException("no data");
More information about the kaffe
mailing list