Changeset 29439

Timestamp:

2014-11-17T13:53:30+13:00 (9 years ago)

Author:

kjdon

Message:

fixed up a few null pointer exceptions that showed up with infomine collection

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -197 +197 @@
             document_type = getDocumentType(basic_doc_list, collection, userContext, page_response);
         }
-        if (document_type != null)
-        {
-            // set the doctype from the cgi arg or from the server as an attribute
-            the_document.setAttribute(GSXML.DOC_TYPE_ATT, document_type);
-        }
-        else
-        {
-            logger.error("doctype is null!!!***********");
-        }
+        if (document_type == null)
+        {
+            logger.error("doctype is null!!!***********");
+            document_type = GSXML.DOC_TYPE_SIMPLE;
+        }
+        
+        the_document.setAttribute(GSXML.DOC_TYPE_ATT, document_type);
+        
 
         // Create a parameter list to specify the required structure information
@@ -772 +771 @@
         String path = GSPath.createPath(links);
         Element info_elem = (Element) GSXML.getNodeByPath(ds_response_message, path);
+        if (info_elem == null) {
+            return null;
+        }
         Element doctype_elem = GSXML.getNamedElement(info_elem, "info", "name", "documentType");
         if (doctype_elem != null)