git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1292945 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -7,6 +7,10 @@ Changes that could break older environments: | |||||
| Fixed bugs: | 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: | Other changes: | ||||
| -------------- | -------------- | ||||
| @@ -1072,6 +1072,13 @@ public class XMLCatalog extends DataType | |||||
| // Apache resolver's resolveEntity method to cover | // Apache resolver's resolveEntity method to cover | ||||
| // this possibility. | // this possibility. | ||||
| // | // | ||||
| if (base == null) { | |||||
| try { | |||||
| base = FILE_UTILS.getFileURL(getProject().getBaseDir()).toString(); | |||||
| } catch (MalformedURLException x) { | |||||
| throw new TransformerException(x); | |||||
| } | |||||
| } | |||||
| try { | try { | ||||
| result = | result = | ||||
| (SAXSource) resolve.invoke(resolverImpl, | (SAXSource) resolve.invoke(resolverImpl, | ||||