Browse Source

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
master
Stefan Bodewig 25 years ago
parent
commit
de3b5b8520
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      src/main/org/apache/tools/ant/ProjectHelper.java

+ 3
- 2
src/main/org/apache/tools/ant/ProjectHelper.java View File

@@ -233,10 +233,11 @@ public class ProjectHelper {
if (project.getProperty("basedir") != null) { if (project.getProperty("basedir") != null) {
project.setBasedir(project.getProperty("basedir")); project.setBasedir(project.getProperty("basedir"));
} else { } else {
String buildFileParent = (new File(buildFile.getAbsolutePath())).getParent();
if (baseDir == null) { if (baseDir == null) {
project.setBasedir((new File(buildFile.getParent())).getAbsolutePath());
project.setBasedir((new File(buildFileParent)).getAbsolutePath());
} else { } else {
project.setBasedir((new File(buildFile.getParent(), baseDir)).getAbsolutePath());
project.setBasedir((new File(buildFileParent, baseDir)).getAbsolutePath());
} }
} }




Loading…
Cancel
Save