ilene 2003/07/20 19:49:34
Modified: java/src/org/apache/xalan/xsltc/compiler Import.java
Include.java
Log:
Patch for bugzilla #20537.
When URIResolver was set for includes/imports, the system id of the
included/imported
files was not always set correctly.
Revision Changes Path
1.21 +3 -1
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Import.java
Index: Import.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Import.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Import.java 19 Mar 2003 22:14:08 -0000 1.20
+++ Import.java 21 Jul 2003 02:49:33 -0000 1.21
@@ -106,6 +106,8 @@
if (loader != null) {
final XSLTC xsltc = parser.getXSLTC();
input = loader.loadSource(docToLoad, currLoadedDoc, xsltc);
+ if (input != null)
+ docToLoad = input.getSystemId();
reader = xsltc.getXMLReader();
}
else {
1.25 +3 -1
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Include.java
Index: Include.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Include.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Include.java 19 Mar 2003 22:14:08 -0000 1.24
+++ Include.java 21 Jul 2003 02:49:33 -0000 1.25
@@ -107,6 +107,8 @@
if (loader != null) {
final XSLTC xsltc = parser.getXSLTC();
input = loader.loadSource(docToLoad, currLoadedDoc, xsltc);
+ if (input != null)
+ docToLoad = input.getSystemId();
reader = xsltc.getXMLReader();
}
else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
