cvs commit: xml-xalan/java/src/org/apache/xalan/templates ElemTemplateElement.java

[mmidy]

mmidy       00/10/10 15:12:32

  Modified:    java/src/org/apache/xalan/templates ElemTemplateElement.java
  Log:
  Make sure URI is not null.
  
  Revision  Changes    Path
  1.11      +12 -10    
xml-xalan/java/src/org/apache/xalan/templates/ElemTemplateElement.java
  
  Index: ElemTemplateElement.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemTemplateElement.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ElemTemplateElement.java  2000/10/03 20:14:09     1.10
  +++ ElemTemplateElement.java  2000/10/10 22:12:32     1.11
  @@ -642,16 +642,18 @@
     private boolean excludeResultNSDecl(String prefix, String uri)
       throws SAXException
     {
  -    if(uri.equals(Constants.S_XSLNAMESPACEURL)
  -       || getStylesheet().containsExtensionElementURI(uri)
  -       || uri.equals("http://xml.apache.org/xslt";)
  -       || uri.equals("http://xsl.lotus.com/";)
  -       || uri.equals("http://xsl.lotus.com";))
  -      return true; 
  -    
  -    if(getStylesheet().containsExcludeResultPrefix(prefix))
  -      return true;
  -    
  +    if (uri != null)
  +    {  
  +      if(uri.equals(Constants.S_XSLNAMESPACEURL)
  +         || getStylesheet().containsExtensionElementURI(uri)
  +         || uri.equals("http://xml.apache.org/xslt";)
  +         || uri.equals("http://xsl.lotus.com/";)
  +         || uri.equals("http://xsl.lotus.com";))
  +        return true; 
  +      
  +      if(getStylesheet().containsExcludeResultPrefix(prefix))
  +        return true;
  +    }
       return false;
     }