ilene 2002/11/27 09:40:38
Modified: java/src/org/apache/xpath/objects XNodeSet.java
java/src/org/apache/xpath/axes NodeSequence.java
Log:
The is a better patch for bugzilla #14862 and more consistent with code in xslt20
branch.
Revision Changes Path
1.23 +1 -1 xml-xalan/java/src/org/apache/xpath/objects/XNodeSet.java
Index: XNodeSet.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XNodeSet.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XNodeSet.java 11 Nov 2002 16:04:18 -0000 1.22
+++ XNodeSet.java 27 Nov 2002 17:40:38 -0000 1.23
@@ -132,7 +132,7 @@
*/
public XNodeSet(DTMManager dtmMgr)
{
- super(dtmMgr);
+ this(DTM.NULL,dtmMgr);
}
/**
1.7 +3 -2 xml-xalan/java/src/org/apache/xpath/axes/NodeSequence.java
Index: NodeSequence.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/NodeSequence.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NodeSequence.java 27 Nov 2002 15:24:29 -0000 1.6
+++ NodeSequence.java 27 Nov 2002 17:40:38 -0000 1.7
@@ -538,10 +538,11 @@
// If this NodeSequence wraps a mutable nodeset, then
// m_last will not reflect the size of the nodeset if
// it has been mutated...
- if (null != m_obj && m_obj instanceof NodeSetDTM)
+ if (m_iter instanceof NodeSetDTM)
{
- return ((NodeSetDTM)m_obj).getLength();
+ return m_iter.getLength();
}
+
if(-1 == m_last)
{
int pos = m_next;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
