Propogate the bug fixes for 15830 and 15636 from Arun Yadav (Arun.Yadav@sun.com)
to XSLTC_DTM.


git-svn-id: https://svn.apache.org/repos/asf/xalan/java/branches/XSLTC_DTM@337362 13f79535-47bb-0310-9956-ffa450edef68

src/org/apache/xalan/xsltc/compiler/KeyCall.java

diff --git a/src/org/apache/xalan/xsltc/compiler/KeyCall.java b/src/org/apache/xalan/xsltc/compiler/KeyCall.java
index 0f588ed..a9d4636 100644
--- a/src/org/apache/xalan/xsltc/compiler/KeyCall.java
+++ b/src/org/apache/xalan/xsltc/compiler/KeyCall.java
@@ -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());

src/org/apache/xalan/xsltc/trax/TransformerImpl.java

diff --git a/src/org/apache/xalan/xsltc/trax/TransformerImpl.java b/src/org/apache/xalan/xsltc/trax/TransformerImpl.java
index 05ca902..3422e84 100644
--- a/src/org/apache/xalan/xsltc/trax/TransformerImpl.java
+++ b/src/org/apache/xalan/xsltc/trax/TransformerImpl.java
@@ -1055,7 +1055,7 @@
 	    _parameters.put(name, value);
 	}
 	else {
-	    _translet.addParameter(name, value, false);
+	    _translet.addParameter(name, value);
 	}
     }