From 9140aaae28cde7039a2013b943864802f75a7502 Mon Sep 17 00:00:00 2001 From: "Jesse N. Glick" Date: Thu, 23 Feb 2012 20:42:47 +0000 Subject: [PATCH] #52754: correcting basedir for external resolver. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1292945 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 4 ++++ src/main/org/apache/tools/ant/types/XMLCatalog.java | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/WHATSNEW b/WHATSNEW index fd9645999..3b843092c 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -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: -------------- diff --git a/src/main/org/apache/tools/ant/types/XMLCatalog.java b/src/main/org/apache/tools/ant/types/XMLCatalog.java index 77a90d11e..1edc10011 100644 --- a/src/main/org/apache/tools/ant/types/XMLCatalog.java +++ b/src/main/org/apache/tools/ant/types/XMLCatalog.java @@ -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,