You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mm...@apache.org on 2001/09/17 23:55:42 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath/axes UnionPathIterator.java
mmidy 01/09/17 14:55:42
Modified: java/src/org/apache/xpath/axes UnionPathIterator.java
Log:
Bug 3533: Check for null m_iterators before trying to use it.
Revision Changes Path
1.25 +16 -10 xml-xalan/java/src/org/apache/xpath/axes/UnionPathIterator.java
Index: UnionPathIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/UnionPathIterator.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- UnionPathIterator.java 2001/08/21 03:06:45 1.24
+++ UnionPathIterator.java 2001/09/17 21:55:42 1.25
@@ -471,13 +471,16 @@
{
UnionPathIterator clone = (UnionPathIterator) super.clone();
- int n = m_iterators.length;
+ if (m_iterators != null)
+ {
+ int n = m_iterators.length;
- clone.m_iterators = new LocPathIterator[n];
+ clone.m_iterators = new LocPathIterator[n];
- for (int i = 0; i < n; i++)
- {
- clone.m_iterators[i] = (LocPathIterator)m_iterators[i].clone();
+ for (int i = 0; i < n; i++)
+ {
+ clone.m_iterators[i] = (LocPathIterator)m_iterators[i].clone();
+ }
}
return clone;
@@ -521,12 +524,15 @@
m_last = 0;
m_lastFetched = DTM.NULL;
- int n = m_iterators.length;
-
- for (int i = 0; i < n; i++)
+ if (m_iterators != null)
{
- m_iterators[i].reset();
- m_iterators[i].nextNode();
+ int n = m_iterators.length;
+
+ for (int i = 0; i < n; i++)
+ {
+ m_iterators[i].reset();
+ m_iterators[i].nextNode();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org