cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/dom MultiDOM.java

[santiagopg]

santiagopg    2002/06/21 12:15:34

  Modified:    java/src/org/apache/xalan/xsltc/dom MultiDOM.java
  Log:
  Better fix for Bugzilla 9068.
  
  Revision  Changes    Path
  1.20      +6 -5      
xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java
  
  Index: MultiDOM.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- MultiDOM.java     21 Jun 2002 18:00:10 -0000      1.19
  +++ MultiDOM.java     21 Jun 2002 19:15:34 -0000      1.20
  @@ -112,11 +112,11 @@
        }
   
        public NodeIterator setStartNode(final int node) {
  -         _mask = node & SET;
  -         int dom = node >>> 24;
  +         final int dom = node >>> 24;
  +         final int mask = node & SET;
   
  -         // Get a new source for the first time only
  -         if (_source == null) {
  +         // Get a new source first time and when mask changes
  +         if (_source == null || _mask != mask) {
                if (_type == NO_TYPE) {
                    _source = _adapters[dom].getAxisIterator(_axis);
                }
  @@ -128,6 +128,7 @@
                }
            }
   
  +         _mask = mask;
            _source.setStartNode(node & CLR);
            return this;
        }
  
  
  

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