From de3b5b85205a94af26eafbbd493e4b1d99e4c16f Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 11 Aug 2000 12:29:34 +0000 Subject: [PATCH] Work around a problem with a NullPointerException on IBM JDK 1.3/Linux. buildFile.getParent() returns null if buildFile is not absolute. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267924 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/ProjectHelper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java index d9b673930..0f462f471 100644 --- a/src/main/org/apache/tools/ant/ProjectHelper.java +++ b/src/main/org/apache/tools/ant/ProjectHelper.java @@ -233,10 +233,11 @@ public class ProjectHelper { if (project.getProperty("basedir") != null) { project.setBasedir(project.getProperty("basedir")); } else { + String buildFileParent = (new File(buildFile.getAbsolutePath())).getParent(); if (baseDir == null) { - project.setBasedir((new File(buildFile.getParent())).getAbsolutePath()); + project.setBasedir((new File(buildFileParent)).getAbsolutePath()); } else { - project.setBasedir((new File(buildFile.getParent(), baseDir)).getAbsolutePath()); + project.setBasedir((new File(buildFileParent, baseDir)).getAbsolutePath()); } }