You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by il...@apache.org on 2002/10/07 21:20:38 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/transformer TransformerImpl.java
ilene 2002/10/07 12:20:38
Modified: test test.properties
java/src/org/apache/xalan/transformer TransformerImpl.java
Log:
Committing Igor Hersht's (igorh@ca.ibm.com) patch for bugzilla #10176.
Also, removing testcase position102 from the excludes list for the smoketest
since it now runs.
Revision Changes Path
1.76 +1 -2 xml-xalan/test/test.properties
Index: test.properties
===================================================================
RCS file: /home/cvs/xml-xalan/test/test.properties,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- test.properties 4 Oct 2002 21:18:22 -0000 1.75
+++ test.properties 7 Oct 2002 19:20:37 -0000 1.76
@@ -127,11 +127,10 @@
# Bugzilla6927 output89.xsl;output90.xsl
# Bugzilla7163 output97.xsl
# Bugzilla8473 namespace137.xsl
-# Bugzilla10176 position102.xsl
# Bugzilla10616 copy56.xsl;copy58.xsl;copy59.xsl;copy60.xsl
# Bugzilla12543 axes129.xsl
# Bugzilla12690 axes62.xsl
-smoketest.conf.normal.excludes=attribset40.xsl;axes129.xsl;axes62.xsl;numbering14.xsl;numbering15.xsl;output87.xsl;numberformat45.xsl;numberformat46.xsl;output89.xsl;output90.xsl;output97.xsl;namespace137.xsl;position102.xsl;copy56.xsl;copy58.xsl;copy59.xsl;copy60.xsl;namespace141.xsl
+smoketest.conf.normal.excludes=attribset40.xsl;axes129.xsl;axes62.xsl;numbering14.xsl;numbering15.xsl;output87.xsl;numberformat45.xsl;numberformat46.xsl;output89.xsl;output90.xsl;output97.xsl;namespace137.xsl;copy56.xsl;copy58.xsl;copy59.xsl;copy60.xsl;namespace141.xsl
smoketest.conf.supplemental.excludes=
smoketest.extensions.excludes=javaBugzilla3722.xsl;libraryNodeset05.xsl;libraryNodeset06.xsl;libraryNodeset07.xsl;libraryNodeset08.xsl
1.136 +10 -5 xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- TransformerImpl.java 7 Oct 2002 18:16:15 -0000 1.135
+++ TransformerImpl.java 7 Oct 2002 19:20:37 -0000 1.136
@@ -2016,11 +2016,12 @@
DTM dtm = m_xcontext.getDTM(child);
short nodeType = dtm.getNodeType(child);
boolean isDefaultTextRule = false;
+ boolean isApplyImports = false;
if (null == template)
{
int maxImportLevel, endImportLevel=0;
- boolean isApplyImports = ((xslInstruction == null)
+ isApplyImports = ((xslInstruction == null)
? false
: xslInstruction.getXSLToken()
== Constants.ELEMNAME_APPLY_IMPORTS);
@@ -2110,8 +2111,10 @@
pushPairCurrentMatched(template, child);
// Fix copy copy29 test.
- DTMIterator cnl = new org.apache.xpath.NodeSetDTM(child, m_xcontext.getDTMManager());
- m_xcontext.pushContextNodeList(cnl);
+ if (!isApplyImports) {
+ DTMIterator cnl = new org.apache.xpath.NodeSetDTM(child, m_xcontext.getDTMManager());
+ m_xcontext.pushContextNodeList(cnl);
+ }
if (isDefaultTextRule)
{
@@ -2160,8 +2163,10 @@
{
m_xcontext.getVarStack().unlink();
m_xcontext.popCurrentNode();
- m_xcontext.popContextNodeList();
- popCurrentMatched();
+ if (!isApplyImports) {
+ m_xcontext.popContextNodeList();
+ popCurrentMatched();
+ }
popElemTemplateElement();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org