Changeset 13568

Timestamp:

2007-01-11T14:31:23+13:00 (17 years ago)

Author:

shaoqun

Message:

added the guard to check the null node begore using it

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/GS2BrowseAction.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/GS2BrowseAction.java

@@ -278 +278 @@
     // process the metadata requests
     Element metadata_response = (Element)this.mr.process(metadata_message);
-    if (did_classifier) {
+        if (did_classifier) {
         // the classifier one will be the first response
         // add the metadata lists for each node back into the 
@@ -284 +284 @@
         path = GSPath.appendLink(GSXML.RESPONSE_ELEM, 
                    GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
-        NodeList meta_response_cls = GSXML.getNodeByPath(metadata_response, path).getChildNodes();
+            Node pathNode = GSXML.getNodeByPath(metadata_response, path);
+            if (pathNode ==null){
+            return page_response; 
+        }
+        NodeList meta_response_cls = pathNode.getChildNodes();
         for (int i = 0; i < cl_nodes.getLength(); i++) {
         GSXML.mergeMetadataLists(cl_nodes.item(i), meta_response_cls.item(i));
-        }
-    }
+        
+        }
+    }
+
     if (did_documents) {
         NodeList meta_response_docs = null;
@@ -295 +301 @@
         path = GSPath.appendLink(GSXML.RESPONSE_ELEM, 
                      GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
-        meta_response_docs = GSXML.getNodeByPath(metadata_response, path).getChildNodes();
+        Node pathNode = GSXML.getNodeByPath(metadata_response, path);
+        if (pathNode ==null){
+            return page_response;
+                 }
+
+        meta_response_docs = pathNode.getChildNodes();
+        
+
         } else { // its the second response
-        meta_response_docs = GSXML.getChildByTagName(metadata_response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(1), GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER).getChildNodes();
+                Node nodes = GSXML.getChildByTagName(metadata_response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(1), GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
+        if (nodes ==null){
+            return page_response;
+                 }
+        meta_response_docs = nodes.getChildNodes();
         }