sboag 2002/06/11 11:58:05
Modified: java/src/org/apache/xalan/templates ElemNumber.java
java/src/org/apache/xpath/compiler Lexer.java
Log:
From Ilene Seelemann:
Added the following in blue to line 395 of Lexer.java
if ((-1 != posOfNSSep) ||
((m_namespaceContext != null) &&
(m_namespaceContext.handlesNullPrefixes())))
I'm also including ElemNumber.java which really doesn't need to
explicitly state that it implements PrefixResolver.
Without these updates everything does run fine.
Revision Changes Path
1.26 +1 -1
xml-xalan/java/src/org/apache/xalan/templates/ElemNumber.java
Index: ElemNumber.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemNumber.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ElemNumber.java 10 Jun 2002 21:34:40 -0000 1.25
+++ ElemNumber.java 11 Jun 2002 18:58:05 -0000 1.26
@@ -110,7 +110,7 @@
* </pre>
* @see <a href="http://www.w3.org/TR/xslt#number";>number in XSLT
Specification</a>
*/
-public class ElemNumber extends ElemTemplateElement implements PrefixResolver
+public class ElemNumber extends ElemTemplateElement
{
private class MyPrefixResolver implements PrefixResolver {
1.11 +2 -1 xml-xalan/java/src/org/apache/xpath/compiler/Lexer.java
Index: Lexer.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/Lexer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Lexer.java 10 Jun 2002 21:34:40 -0000 1.10
+++ Lexer.java 11 Jun 2002 18:58:05 -0000 1.11
@@ -392,7 +392,8 @@
isNum = false;
isStartOfPat = mapPatternElemPos(nesting, isStartOfPat, isAttrName);
- if ((-1 != posOfNSSep) || (m_namespaceContext.handlesNullPrefixes()))
+ if ((-1 != posOfNSSep) ||
+ ((m_namespaceContext != null) &&
(m_namespaceContext.handlesNullPrefixes())))
{
posOfNSSep = mapNSTokens(pat, startSubstring, posOfNSSep, nChars);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
