mbenson 2005/06/09 06:04:39
Modified: src/main/org/apache/tools/ant/types XMLCatalog.java
Log:
XmlCatalog had become broken with any dtd/entity location that was not a file.
PR: 35269
Revision Changes Path
1.46 +1 -1 ant/src/main/org/apache/tools/ant/types/XMLCatalog.java
Index: XMLCatalog.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/XMLCatalog.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- XMLCatalog.java 23 May 2005 19:30:38 -0000 1.45
+++ XMLCatalog.java 9 Jun 2005 13:04:39 -0000 1.46
@@ -670,7 +670,7 @@
}
}
- if (url != null) {
+ if (url != null && url.getProtocol().equals("file")) {
String fileName = FILE_UTILS.fromURI(url.toString());
if (fileName != null) {
log("fileName " + fileName, Project.MSG_DEBUG);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
