cvs commit: xml-xalan/java/src/org/apache/xpath/axes NodeSequence.java UnionPathIterator.java

[jycli]

jycli       2004/10/21 08:45:57

  Modified:    java/src/org/apache/xpath/axes NodeSequence.java
                        UnionPathIterator.java
  Log:
  a fix for bug XALANJ-1810
  Reviewed by Morris Kwan ([EMAIL PROTECTED])
  
  Revision  Changes    Path
  1.13      +4 -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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- NodeSequence.java 17 Aug 2004 19:25:34 -0000      1.12
  +++ NodeSequence.java 21 Oct 2004 15:45:57 -0000      1.13
  @@ -539,7 +539,9 @@
      */
     public Object clone() throws CloneNotSupportedException
     {
  -     return super.clone();
  +          NodeSequence clone = (NodeSequence) super.clone();
  +          if (null != m_iter) clone.m_iter = (DTMIterator) m_iter.clone();
  +          return clone;
     }
   
   
  
  
  
  1.35      +12 -12    
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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- UnionPathIterator.java    17 Aug 2004 19:25:34 -0000      1.34
  +++ UnionPathIterator.java    21 Oct 2004 15:45:57 -0000      1.35
  @@ -277,17 +277,17 @@
     {
   
       UnionPathIterator clone = (UnionPathIterator) super.clone();
  -//    if (m_iterators != null)
  -//    {
  -//      int n = m_iterators.length;
  -//
  -//      clone.m_iterators = new LocPathIterator[n];
  -//
  -//      for (int i = 0; i < n; i++)
  -//      {
  -//        clone.m_iterators[i] = (LocPathIterator)m_iterators[i].clone();
  -//      }
  -//    }
  +    if (m_iterators != null)
  +    {
  +      int n = m_iterators.length;
  +      
  +      clone.m_iterators = new DTMIterator[n];
  +
  +      for (int i = 0; i < n; i++)
  +      {
  +        clone.m_iterators[i] = (DTMIterator)m_iterators[i].clone();
  +      }
  +    }
   
       return clone;
     }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]