diff options
| author | Mark Wielaard <mark@klomp.org> | 2003-02-07 21:33:05 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2003-02-07 21:33:05 +0000 |
| commit | b0b74f371eb96d60047b221711bb98361fde5f58 (patch) | |
| tree | 4fc6fb5d08af0c5b9517d44d9a6fd1ad92e7589e /libjava | |
| parent | 5ccbcd8cf9f1036b918569805e274374e603f4bc (diff) | |
| download | gcc-b0b74f371eb96d60047b221711bb98361fde5f58.zip gcc-b0b74f371eb96d60047b221711bb98361fde5f58.tar.gz gcc-b0b74f371eb96d60047b221711bb98361fde5f58.tar.bz2 | |
JarFile.java (JarFile(String, boolean)): Read manifest when verify is true.
* java/util/jar/JarFile.java (JarFile(String, boolean)): Read manifest
when verify is true.
(JarFile(File, boolean)): Likewise.
(manifestRead): Set manifestRead field correctly.
From-SVN: r62545
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/java/util/jar/JarFile.java | 24 |
2 files changed, 28 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4937942..3724009 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-02-07 Mark Wielaard <mark@klomp.org> + + * java/util/jar/JarFile.java (JarFile(String, boolean)): Read manifest + when verify is true. + (JarFile(File, boolean)): Likewise. + (manifestRead): Set manifestRead field correctly. + 2003-02-07 Stephen Crawley <crawley@dstc.edu.au> * java/math/BigDecimal(valueOf): fix DiagBigDecimal val008, val013 diff --git a/libjava/java/util/jar/JarFile.java b/libjava/java/util/jar/JarFile.java index d6fd984..394b51a 100644 --- a/libjava/java/util/jar/JarFile.java +++ b/libjava/java/util/jar/JarFile.java @@ -1,5 +1,5 @@ /* JarFile.java - Representation of a jar file - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -71,10 +71,10 @@ public class JarFile extends ZipFile */ private Manifest manifest; - /** Wether to verify the manifest and all entries. */ + /** Whether to verify the manifest and all entries. */ private boolean verify; - /** Wether the has already been loaded. */ + /** Whether the has already been loaded. */ private boolean manifestRead = false; // Constructors @@ -109,6 +109,11 @@ public class JarFile extends ZipFile FileNotFoundException, IOException { super(fileName); + if (verify) + { + manifest = readManifest(); + verify(); + } } /** @@ -141,6 +146,11 @@ public class JarFile extends ZipFile IOException { super(file); + if (verify) + { + manifest = readManifest(); + verify(); + } } /** @@ -165,6 +175,11 @@ public class JarFile extends ZipFile FileNotFoundException, IOException, IllegalArgumentException { super(file, mode); + if (verify) + { + manifest = readManifest(); + verify(); + } } // Methods @@ -196,15 +211,18 @@ public class JarFile extends ZipFile if (manEntry != null) { InputStream in = super.getInputStream(manEntry); + manifestRead = true; return new Manifest(in); } else { + manifestRead = true; return null; } } catch (IOException ioe) { + manifestRead = true; return null; } } |