cvs commit: xml-xindice/java/src/org/apache/xindice/core/query XPathQueryResolver.java

[vgritsenko]

vgritsenko    2004/05/21 05:45:19

  Modified:    java/src/org/apache/xindice/core/query
                        XPathQueryResolver.java
  Log:
  Skip occasional empty documents - see bug 22155
  
  Revision  Changes    Path
  1.31      +11 -4     
xml-xindice/java/src/org/apache/xindice/core/query/XPathQueryResolver.java
  
  Index: XPathQueryResolver.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/XPathQueryResolver.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- XPathQueryResolver.java   9 Apr 2004 11:56:03 -0000       1.30
  +++ XPathQueryResolver.java   21 May 2004 12:45:19 -0000      1.31
  @@ -1186,12 +1186,19 @@
               node = null;
   
                        while (keyPos < keySet.length) {
  -                DBDocument d = (DBDocument) 
context.getDocument(keySet[keyPos++]);
  +                final Key key = keySet[keyPos++];
  +                final DBDocument d = (DBDocument) context.getDocument(key);
                   if (d == null) {
                       continue;
                   }
   
  -                Node n = d.getDocumentElement();
  +                final Node n = d.getDocumentElement();
  +                if (n == null) {
  +                    if (log.isInfoEnabled()) {
  +                        log.info("Document " + 
context.getCanonicalDocumentName(key)  + " is empty, skipping.");
  +                    }
  +                    continue;
  +                }
   
                   XPathContext xpc = new XPathContext();
                   PrefixResolver pfx;