Changeset 26848 for main

Timestamp:

2013-02-04T23:29:15+13:00 (11 years ago)

Author:

davidb

Message:

Extra check added to avoid a null-pointer exception (situation came to light when emacs has stored an auto-save file in the XSL area that was not well formed XML). Change is to skip any file that returns NULL when asked for its XML form

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -199 +199 @@
         {
             Document currentDoc = this.converter.getDOM(currentFile);
+            if (currentDoc == null) {
+                // Can happen if an editor creates an auto-save temporary file 
+                // (such as #header.xsl#) that is not well formed XML
+                continue;
+            }
+
             NodeList metadataElems = currentDoc.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "metadata"); //gsf:metadata
             NodeList foreachMetadataElems = currentDoc.getElementsByTagNameNS(GSXML.GSF_NAMESPACE, "foreach-metadata"); //gsf:foreach-metadata