cvs commit: cocoon-2.1/src/java/org/apache/cocoon/transformation XIncludeTransformer.java

[sylvain]

sylvain     2004/02/20 10:46:49

  Modified:    src/java/org/apache/cocoon/transformation
                        XIncludeTransformer.java
  Log:
  Robustify against buggy SAX events with a null namespace URI
  
  Revision  Changes    Path
  1.16      +3 -3      
cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- XIncludeTransformer.java  15 Feb 2004 10:07:35 -0000      1.15
  +++ XIncludeTransformer.java  20 Feb 2004 18:46:49 -0000      1.16
  @@ -179,7 +179,7 @@
           }
   
           public void startElement(String uri, String name, String raw, 
Attributes attr) throws SAXException {
  -            if (xIncludeLevel == 1 && useFallback && 
name.equals(XINCLUDE_FALLBACK_ELEMENT) && uri.equals(XINCLUDE_NAMESPACE_URI)) {
  +            if (xIncludeLevel == 1 && useFallback && 
XINCLUDE_NAMESPACE_URI.equals(uri) && XINCLUDE_FALLBACK_ELEMENT.equals(name)) {
                   fallbackLevel++;
   
                   // don't need these anymore
  @@ -193,7 +193,7 @@
               }
   
               xmlBaseSupport.startElement(uri, name, raw, attr);
  -            if (uri.equals(XINCLUDE_NAMESPACE_URI)) {
  +            if (XINCLUDE_NAMESPACE_URI.equals(uri)) {
                   if (XINCLUDE_INCLUDE_ELEMENT.equals(name)) {
                       String href = 
attr.getValue("",XINCLUDE_INCLUDE_ELEMENT_HREF_ATTRIBUTE);
                       if (href == null) {