sboag 01/05/14 06:25:18
Modified: java/src/org/apache/xml/dtm/sax2dtm Tag: DTM_EXP
SAX2DTM.java
Log:
Fix for dispatchCharactersEvents and getStringValue, to fix termination
of loop when iterating over element children.
Revision Changes Path
No revision
No revision
1.1.2.2 +8 -7
xml-xalan/java/src/org/apache/xml/dtm/sax2dtm/Attic/SAX2DTM.java
Index: SAX2DTM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/sax2dtm/Attic/SAX2DTM.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SAX2DTM.java 2001/05/14 05:19:11 1.1.2.1
+++ SAX2DTM.java 2001/05/14 13:25:14 1.1.2.2
@@ -227,14 +227,13 @@
{
int offset = -1;
int length = 0;
- int nextSibling = getNodeInfo(identity, OFFSET_NEXTSIBLING);
+ int level = getNodeInfo(identity, OFFSET_LEVEL);
identity = firstChild;
- while(DTM.NULL != identity)
+ while(DTM.NULL != identity
+ && (getNodeInfo(identity, OFFSET_LEVEL) > level))
{
- if (identity == nextSibling)
- break;
type = getNodeType(identity);
if (isTextType(type))
@@ -855,10 +854,12 @@
{
int offset = -1;
int length = 0;
- int nextSibling = getNodeInfo(identity, OFFSET_NEXTSIBLING);
- identity = firstChild;
+ int level = getNodeInfo(identity, OFFSET_LEVEL);
- while (DTM.NULL != identity && identity != nextSibling)
+ identity = firstChild;
+
+ while(DTM.NULL != identity &&
+ (getNodeInfo(identity, OFFSET_LEVEL) > level))
{
type = getNodeType(identity);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
