From 1c2315138ee881376f46af747d2c294894a0918d Mon Sep 17 00:00:00 2001 From: tromey Date: Thu, 10 Feb 2005 02:43:45 +0000 Subject: * gnu/java/net/protocol/jar/Connection.java (getJarFile): Open jar file with OPEN_DELETE. * java/util/zip/ZipFile.java (ZipFile): Call deleteOnExit when OPEN_DELETE is used. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94793 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/util/zip/ZipFile.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'libjava/java/util') diff --git a/libjava/java/util/zip/ZipFile.java b/libjava/java/util/zip/ZipFile.java index 38ec9e6b565..b2dbe705bbf 100644 --- a/libjava/java/util/zip/ZipFile.java +++ b/libjava/java/util/zip/ZipFile.java @@ -1,5 +1,5 @@ /* ZipFile.java -- - Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,8 +117,6 @@ public class ZipFile implements ZipConstants * * The contents of the zip file will be accessible until it is closed. * - * The OPEN_DELETE mode is currently unimplemented in this library - * * @since JDK1.3 * @param mode Must be one of OPEN_READ or OPEN_READ | OPEN_DELETE * @@ -128,11 +126,10 @@ public class ZipFile implements ZipConstants */ public ZipFile(File file, int mode) throws ZipException, IOException { + if (mode != OPEN_READ && mode != (OPEN_READ | OPEN_DELETE)) + throw new IllegalArgumentException("invalid mode"); if ((mode & OPEN_DELETE) != 0) - { - throw new IllegalArgumentException - ("OPEN_DELETE mode not supported yet in java.util.zip.ZipFile"); - } + file.deleteOnExit(); this.raf = new RandomAccessFile(file, "r"); this.name = file.getPath(); } -- cgit v1.2.1