mkwan 2003/03/26 11:06:10
Modified: java/src/org/apache/xalan/xsltc/compiler Tag: XSLTC_DTM
KeyCall.java
java/src/org/apache/xalan/xsltc/trax Tag: XSLTC_DTM
TransformerImpl.java
Log:
Propogate the bug fixes for 15830 and 15636 from Arun Yadav ([EMAIL
PROTECTED])
to XSLTC_DTM.
Revision Changes Path
No revision
No revision
1.7.6.8 +3 -4
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/KeyCall.java
Index: KeyCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/KeyCall.java,v
retrieving revision 1.7.6.7
retrieving revision 1.7.6.8
diff -u -r1.7.6.7 -r1.7.6.8
--- KeyCall.java 30 Jan 2003 18:41:37 -0000 1.7.6.7
+++ KeyCall.java 26 Mar 2003 19:06:10 -0000 1.7.6.8
@@ -171,8 +171,7 @@
// be added to the resulting node-set.
_valueType = _value.typeCheck(stable);
- if (_valueType != Type.NodeSet && _valueType != Type.ResultTree
- && _valueType != Type.String)
+ if (_valueType != Type.NodeSet && _valueType != Type.String)
{
_value = new CastExpr(_value, Type.String);
}
@@ -274,7 +273,7 @@
// If the second paramter is a node-set we need to go through each
// node in the set, convert each one to a string and do a look up in
// the named index, and then merge all the resulting node sets.
- if (_valueType == Type.NodeSet || _valueType == Type.ResultTree) {
+ if (_valueType == Type.NodeSet) {
// Save current node and current iterator on the stack
il.append(methodGen.loadCurrentNode());
il.append(methodGen.loadIterator());
No revision
No revision
1.37.2.21 +2 -2
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java,v
retrieving revision 1.37.2.20
retrieving revision 1.37.2.21
diff -u -r1.37.2.20 -r1.37.2.21
--- TransformerImpl.java 18 Mar 2003 16:24:33 -0000 1.37.2.20
+++ TransformerImpl.java 26 Mar 2003 19:06:10 -0000 1.37.2.21
@@ -1054,7 +1054,7 @@
_parameters.put(name, value);
}
else {
- _translet.addParameter(name, value, false);
+ _translet.addParameter(name, value);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
