Browse Source

#52754: correcting basedir for external resolver.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1292945 13f79535-47bb-0310-9956-ffa450edef68
master
Jesse N. Glick 13 years ago
parent
commit
9140aaae28
2 changed files with 11 additions and 0 deletions
  1. +4
    -0
      WHATSNEW
  2. +7
    -0
      src/main/org/apache/tools/ant/types/XMLCatalog.java

+ 4
- 0
WHATSNEW View File

@@ -7,6 +7,10 @@ Changes that could break older environments:
Fixed bugs:
-----------

* External XML catalog resolver failed to use project basedir when given an
unmentioned relative path like the internal resolver does.
Bugzilla Report 52754.

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



+ 7
- 0
src/main/org/apache/tools/ant/types/XMLCatalog.java View File

@@ -1072,6 +1072,13 @@ public class XMLCatalog extends DataType
// Apache resolver's resolveEntity method to cover
// this possibility.
//
if (base == null) {
try {
base = FILE_UTILS.getFileURL(getProject().getBaseDir()).toString();
} catch (MalformedURLException x) {
throw new TransformerException(x);
}
}
try {
result =
(SAXSource) resolve.invoke(resolverImpl,


Loading…
Cancel
Save