From 80377e9c7627fc01ff8342577b5b0e7464c76d0b Mon Sep 17 00:00:00 2001 From: Magesh Umasankar Date: Tue, 3 Sep 2002 15:06:57 +0000 Subject: [PATCH] getParentFile may return null. Reported by: Bayyapu, Pavan git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273286 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Expand.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Expand.java b/src/main/org/apache/tools/ant/taskdefs/Expand.java index b84c07a16..dd10d54c3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Expand.java +++ b/src/main/org/apache/tools/ant/taskdefs/Expand.java @@ -146,7 +146,7 @@ public class Expand extends Task { * This method is to be overridden by extending unarchival tasks. */ protected void expandFile(FileUtils fileUtils, File srcF, File dir) { - log("Expanding: " + srcF + " into " + dir, Project.MSG_INFO); + log("Expanding: " + srcF + " into " + dir, Project.MSG_INFO); ZipInputStream zis = null; try { // code from WarExpand @@ -186,7 +186,7 @@ public class Expand extends Task { String[] incls = p.getIncludePatterns(getProject()); if (incls != null) { for (int w = 0; w < incls.length; w++) { - boolean isIncl = + boolean isIncl = DirectoryScanner.match(incls[w], name); if (isIncl) { included = true; @@ -197,7 +197,7 @@ public class Expand extends Task { String[] excls = p.getExcludePatterns(getProject()); if (excls != null) { for (int w = 0; w < excls.length; w++) { - boolean isExcl = + boolean isExcl = DirectoryScanner.match(excls[w], name); if (isExcl) { included = false; @@ -225,7 +225,9 @@ public class Expand extends Task { Project.MSG_VERBOSE); // create intermediary directories - sometimes zip don't add them File dirF = fileUtils.getParentFile(f); - dirF.mkdirs(); + if ( dirF != null ) { + dirF.mkdirs(); + } if (isDirectory) { f.mkdirs();