From 3193a54aacba612c7df0c0b1d9d2466e113e8556 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Tue, 24 Apr 2001 07:13:31 +0000 Subject: [PATCH] Fix stupid NPE introduced with my ZIP changes. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268961 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Zip.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index 4536406e4..2d245dbad 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -278,11 +278,13 @@ public class Zip extends MatchingTask { File zipSrc = fs.getSrc(); ZipEntry entry; + java.util.zip.ZipEntry origEntry; ZipInputStream in = null; try { in = new ZipInputStream(new FileInputStream(zipSrc)); - while ((entry = new ZipEntry(in.getNextEntry())) != null) { + while ((origEntry = in.getNextEntry()) != null) { + entry = new ZipEntry(origEntry); String vPath = entry.getName(); if (zipScanner.match(vPath)) { addParentDirs(null, vPath, zOut, prefix);