From b0b74f371eb96d60047b221711bb98361fde5f58 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Fri, 7 Feb 2003 21:33:05 +0000
Subject: 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
---
 libjava/java/util/jar/JarFile.java | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'libjava/java/util/jar/JarFile.java')

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;
       }
   }
-- 
cgit v1.1