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

[mmidy]

mmidy       00/08/23 09:05:59

  Modified:    java/src/org/apache/xalan/templates FuncDocument.java
  Log:
  Handle empty nodeset as second argument of document function
  
  Revision  Changes    Path
  1.6       +7 -3      
xml-xalan/java/src/org/apache/xalan/templates/FuncDocument.java
  
  Index: FuncDocument.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/FuncDocument.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FuncDocument.java 2000/08/04 19:37:06     1.5
  +++ FuncDocument.java 2000/08/23 16:05:56     1.6
  @@ -129,10 +129,14 @@
         if(XObject.CLASS_NODESET == arg2.getType())
         {
           Node baseNode = arg2.nodeset().nextNode();
  -        Document baseDoc = (Node.DOCUMENT_NODE == baseNode.getNodeType()) ? 
  -                           (Document)baseNode : baseNode.getOwnerDocument();
           
  -        if(baseDoc instanceof Stylesheet)
  +        if (baseNode == null)
  +          warn(xctxt, XSLTErrorResources.WG_EMPTY_SECOND_ARG, null);       
  +        
  +        Document baseDoc = (baseNode == null ? null : (Node.DOCUMENT_NODE == 
baseNode.getNodeType()) ? 
  +                           (Document)baseNode : baseNode.getOwnerDocument());
  +        
  +        if(baseDoc == null || baseDoc instanceof Stylesheet)
           {
             // base = ((Stylesheet)baseDoc).getBaseIdentifier();
             base = xctxt.getNamespaceContext().getBaseIdentifier();