mkwan 2003/04/08 12:28:47
Modified: java/src/org/apache/xalan/xsltc/compiler Stylesheet.java
Log:
Fix another problem related to bug 17448.
Only set the import precedence of an included stylesheet when it
is directly included by this stylesheet. If it is indirectly
included via imports, the import precedence will be different.
Revision Changes Path
1.48 +4 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Stylesheet.java
Index: Stylesheet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Stylesheet.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Stylesheet.java 8 Apr 2003 17:36:14 -0000 1.47
+++ Stylesheet.java 8 Apr 2003 19:28:46 -0000 1.48
@@ -212,7 +212,9 @@
SyntaxTreeNode child = (SyntaxTreeNode)elements.nextElement();
if (child instanceof Include) {
Stylesheet included = ((Include)child).getIncludedStylesheet();
- if (included != null) included.setImportPrecedence(precedence);
+ if (included != null && included._includedFrom == this) {
+ included.setImportPrecedence(precedence);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
