mkwan 2002/12/10 10:27:48
Modified: java/src/org/apache/xalan/processor Tag: xslt20
TransformerFactoryImpl.java
java/src/org/apache/xml/dtm/ref/dom2dtm Tag: xslt20
DOM2DTM.java
Log:
Propogate performance fixes in main branch to xslt20
Revision Changes Path
No revision
No revision
1.42.4.2 +3 -3
xml-xalan/java/src/org/apache/xalan/processor/TransformerFactoryImpl.java
Index: TransformerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/TransformerFactoryImpl.java,v
retrieving revision 1.42.4.1
retrieving revision 1.42.4.2
diff -u -r1.42.4.1 -r1.42.4.2
--- TransformerFactoryImpl.java 6 Dec 2002 19:52:30 -0000 1.42.4.1
+++ TransformerFactoryImpl.java 10 Dec 2002 18:27:47 -0000 1.42.4.2
@@ -860,7 +860,6 @@
throws TransformerConfigurationException
{
- TemplatesHandler builder = newTemplatesHandler();
String baseID = source.getSystemId();
if (null == baseID)
@@ -895,8 +894,6 @@
}
}
- builder.setSystemId(baseID);
-
if (source instanceof DOMSource)
{
DOMSource dsource = (DOMSource) source;
@@ -912,6 +909,9 @@
throw new IllegalArgumentException(messageStr);
}
}
+
+ TemplatesHandler builder = newTemplatesHandler();
+ builder.setSystemId(baseID);
try
{
No revision
No revision
1.28.4.1.2.2 +1 -1
xml-xalan/java/src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
Index: DOM2DTM.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java,v
retrieving revision 1.28.4.1.2.1
retrieving revision 1.28.4.1.2.2
diff -u -r1.28.4.1.2.1 -r1.28.4.1.2.2
--- DOM2DTM.java 10 Oct 2002 14:58:34 -0000 1.28.4.1.2.1
+++ DOM2DTM.java 10 Dec 2002 18:27:48 -0000 1.28.4.1.2.2
@@ -1032,7 +1032,7 @@
{
// XSLT treats PIs, and possibly other things, as having QNames.
String qname = newnode.getNodeName();
- if('#'==newnode.getNodeName().charAt(0))
+ if('#'==qname.charAt(0))
{
// Match old default for this function
// This conversion may or may not be necessary
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
