mkwan 2002/09/18 09:08:37
Modified: java/src/org/apache/xalan/xsltc/compiler Tag: XSLTC_DTM
Import.java
Log:
Fix a problem which causes failed conformance tests in trax.localPath.
Use the same code to convert a local path to a URL string as in the
main branch.
Revision Changes Path
No revision
No revision
1.14.6.3 +4 -8
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.14.6.2
retrieving revision 1.14.6.3
diff -u -r1.14.6.2 -r1.14.6.3
--- Import.java 29 Jul 2002 00:01:22 -0000 1.14.6.2
+++ Import.java 18 Sep 2002 16:08:37 -0000 1.14.6.3
@@ -108,14 +108,10 @@
input = loader.loadSource(docToLoad, currLoadedDoc, xsltc);
}
else {
- File file = new File(docToLoad);
- if (file.exists())
- docToLoad = "file:///"+docToLoad;
- else
- {
- final URL url = new URL(new URL(currLoadedDoc), docToLoad);
+ File file = new File(currLoadedDoc);
+ if (file.exists()) currLoadedDoc = "file:"+currLoadedDoc;
+ final URL url = new URL(new URL(currLoadedDoc), docToLoad);
docToLoad = url.toString();
- }
input = new InputSource(docToLoad);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
