zongaro 2002/07/30 11:05:13
Modified: java/src/org/apache/xalan/processor ProcessorInclude.java
Log:
Applying patches for Morris Kwan for bug 10519. In parse method, if SystemId of the
returned DOMSource object is null, systemID is resolved using href.
Revision Changes Path
1.21 +10 -1
xml-xalan/java/src/org/apache/xalan/processor/ProcessorInclude.java
Index: ProcessorInclude.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorInclude.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ProcessorInclude.java 8 Nov 2001 20:15:48 -0000 1.20
+++ ProcessorInclude.java 30 Jul 2002 18:05:13 -0000 1.21
@@ -238,7 +238,16 @@
if (null != source && source instanceof DOMSource)
{
Node node = ((DOMSource)source).getNode();
- TreeWalker walker = new TreeWalker(handler, new
org.apache.xpath.DOM2Helper(), source.getSystemId());
+
+ String systemId = source.getSystemId();
+ if (systemId == null)
+ {
+ systemId = SystemIDResolver.getAbsoluteURI(getHref(),
+ handler.getBaseIdentifier());
+
+ }
+
+ TreeWalker walker = new TreeWalker(handler, new
org.apache.xpath.DOM2Helper(), systemId);
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
