venu 2003/12/02 01:37:08
Modified: java/src/org/apache/xerces/xinclude XIncludeHandler.java
Log:
check for xpointer as href is optional in latest spec.
Revision Changes Path
1.15 +4 -2
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XIncludeHandler.java 2 Dec 2003 07:58:50 -0000 1.14
+++ XIncludeHandler.java 2 Dec 2003 09:37:08 -0000 1.15
@@ -146,6 +146,7 @@
public final static String HTTP_ACCEPT = "Accept";
public final static String HTTP_ACCEPT_LANGUAGE = "Accept-Language";
public final static String HTTP_ACCEPT_CHARSET = "Accept-Charset";
+ public final static String XPOINTER = "xpointer";
public final static String XINCLUDE_NS_URI =
"http://www.w3.org/2003/XInclude".intern();
@@ -1122,8 +1123,9 @@
// this ties in with the above IURI section, but I suspect Java
already does it
String href = attributes.getValue(XINCLUDE_ATTR_HREF);
String parse = attributes.getValue(XINCLUDE_ATTR_PARSE);
- if (href == null) {
- reportFatalError("HrefMissing");
+ String xpointer = attributes.getValue(XPOINTER);
+ if (href == null && xpointer == null) {
+ reportFatalError("XpointerMissing");
}
if (parse == null) {
parse = XINCLUDE_PARSE_XML;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
