Browse Source

fix fileResource specified using basedir/name attributes

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1090325 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 14 years ago
parent
commit
9af2cd23bf
2 changed files with 12 additions and 0 deletions
  1. +2
    -0
      WHATSNEW
  2. +10
    -0
      src/main/org/apache/tools/ant/types/resources/FileResource.java

+ 2
- 0
WHATSNEW View File

@@ -32,6 +32,8 @@ Fixed bugs:
* Read on System.in hangs for forked java task.
Bugzilla Report 50960.

* FileResource specified using basedir/name attributes was non-functional.

Other changes:
--------------



+ 10
- 0
src/main/org/apache/tools/ant/types/resources/FileResource.java View File

@@ -108,6 +108,16 @@ public class FileResource extends Resource implements Touchable, FileProvider,
return ((FileResource) getCheckedRef()).getFile();
}
dieOnCircularReference();
synchronized (this) {
if (file == null) {
//try to resolve file set via basedir/name property setters:
File d = getBaseDir();
String n = super.getName();
if (n != null) {
setFile(FILE_UTILS.resolveFile(d, n));
}
}
}
return file;
}



Loading…
Cancel
Save