mrglavas 2005/04/13 10:33:45 Modified: java/src/org/apache/xerces/xinclude XIncludeHandler.java Log: Fixing JIRA Issue #1062: http://issues.apache.org/jira/browse/XERCESJ-1062 At the end of an element we should be clearing the sawInclude array at the current depth instead of depth + 1. This was causing XIncludeHandler to report an error when an xi:include element was the immediate descendant of a sibling of another xi:include element. Revision Changes Path 1.45 +3 -3 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.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- XIncludeHandler.java 18 Feb 2005 21:30:23 -0000 1.44 +++ XIncludeHandler.java 13 Apr 2005 17:33:45 -0000 1.45 @@ -946,7 +946,7 @@ } // reset the out of scope stack elements setSawFallback(fDepth + 1, false); - setSawInclude(fDepth + 1, false); + setSawInclude(fDepth, false); // check if an xml:base has gone out of scope if (fBaseURIScope.size() > 0 && fDepth == fBaseURIScope.peek()) { @@ -983,7 +983,7 @@ // reset the out of scope stack elements setSawFallback(fDepth + 1, false); - setSawInclude(fDepth + 1, false); + setSawInclude(fDepth, false); // check if an xml:base has gone out of scope if (fBaseURIScope.size() > 0 && fDepth == fBaseURIScope.peek()) {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
