mrglavas 2003/12/01 14:59:48
Modified: java/src/org/apache/xerces/xinclude XIncludeHandler.java
Log:
Partial fix for Bug #24992. Fix NPE which would occur if an
include parent has no base URI.
Revision Changes Path
1.13 +1 -1
xml-xerces/java/src/org/apache/xerces/xinclude/XIncludeHandler.java
Index: XIncludeHandler.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/xinclude/XIncludeHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XIncludeHandler.java 1 Dec 2003 22:45:20 -0000 1.12
+++ XIncludeHandler.java 1 Dec 2003 22:59:48 -0000 1.13
@@ -1365,7 +1365,7 @@
// of resolving relative references, or if it should be added if they
are different at all.
// Revisit this after a final decision has been made.
// The decision also affects whether we output the file name of the
URI, or just the path.
- return parentBaseURI.equals(baseURI);
+ return parentBaseURI != null && parentBaseURI.equals(baseURI);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
