cvs commit: xml-xalan/src/org/apache/xalan/xpath XPathProcessorImpl.java

[sboag]

sboag       00/03/16 19:06:34

  Modified:    src/org/apache/xalan/xpath XPathProcessorImpl.java
  Log:
  Merged branch fix for namespace axes fix.
  
  Revision  Changes    Path
  1.28      +2 -2      
xml-xalan/src/org/apache/xalan/xpath/XPathProcessorImpl.java
  
  Index: XPathProcessorImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/XPathProcessorImpl.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- XPathProcessorImpl.java   2000/03/13 16:46:14     1.27
  +++ XPathProcessorImpl.java   2000/03/17 03:06:33     1.28
  @@ -2245,9 +2245,9 @@
           {
             if(XPath.FROM_NAMESPACE == axesType)
             {
  -            String prefix = 
(String)this.m_xpath.m_tokenQueue[this.m_xpath.m_opMap[m_queueMark-1]];
  +            String prefix = (String)this.m_xpath.m_tokenQueue[m_queueMark-1];
               String namespace = 
((PrefixResolver)m_namespaceContext).getNamespaceForPrefix(prefix);
  -            this.m_xpath.m_tokenQueue[this.m_xpath.m_opMap[m_queueMark-1]] = 
namespace;
  +            this.m_xpath.m_tokenQueue[m_queueMark-1] = namespace;
             }
             m_xpath.m_opMap[m_xpath.m_opMap[XPath.MAPINDEX_LENGTH]] = 
m_queueMark-1;
           }