PatchSet 5594
Date: 2005/02/23 19:37:20
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: JarFile fixlet
2005-02-23 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
2005-02-21 Mark Wielaard <[EMAIL PROTECTED]>
* java/util/jar/JarFile.java (verifyHashes): Check whether ZipEntry
exists.
Members:
ChangeLog:1.3639->1.3640
libraries/javalib/java/util/jar/JarFile.java:1.9->1.10
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3639 kaffe/ChangeLog:1.3640
--- kaffe/ChangeLog:1.3639 Wed Feb 23 19:35:09 2005
+++ kaffe/ChangeLog Wed Feb 23 19:37:20 2005
@@ -2,6 +2,15 @@
Resynced with GNU Classpath.
+ 2005-02-21 Mark Wielaard <[EMAIL PROTECTED]>
+
+ * java/util/jar/JarFile.java (verifyHashes): Check whether ZipEntry
+ exists.
+
+2005-02-23 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
2005-02-22 Robert Schuster <[EMAIL PROTECTED]>
* java/io/InputStreamReader.java: Fixed compilation
Index: kaffe/libraries/javalib/java/util/jar/JarFile.java
diff -u kaffe/libraries/javalib/java/util/jar/JarFile.java:1.9
kaffe/libraries/javalib/java/util/jar/JarFile.java:1.10
--- kaffe/libraries/javalib/java/util/jar/JarFile.java:1.9 Wed Jan 5
20:06:46 2005
+++ kaffe/libraries/javalib/java/util/jar/JarFile.java Wed Feb 23 19:37:21 2005
@@ -726,7 +726,14 @@
byte[] entryBytes = null;
try
{
- entryBytes = readManifestEntry(super.getEntry(entry));
+ ZipEntry e = super.getEntry(entry);
+ if (e == null)
+ {
+ if (DEBUG)
+ debug("verifyHashes: no entry '" + entry + "'");
+ return false;
+ }
+ entryBytes = readManifestEntry(e);
}
catch (IOException ioe)
{
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
