Changeset 33346

Timestamp:

2019-07-23T13:15:39+12:00 (5 years ago)

Author:

kjdon

Message:

check for empty child_id, and null DBInfo before using them

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java

@@ -321 +321 @@
   }
       
-    protected void processChildren(String node_id, DBInfo info, String metadata, Vector<String> values,
-                   boolean recursive) {
+    protected void processChildren(String node_id, DBInfo info, String metadata, Vector<String> values, boolean recursive) {
       String contains = info.getInfo("contains");
       contains = StringUtils.replace(contains, "\"", node_id);
-      String[] children = contains.split(";"); 
+      String[] children = contains.split(";");
+
       for (int i = 0; i < children.length; i++) {
     
     String child_id = children[i];
-    Vector<String> more_values = getMetaValuesForOID(child_id, null, metadata);
-    if (more_values != null) {
-      values.addAll(more_values);
-    }
-    if (recursive) {
-       DBInfo child_info = this.coll_db.getInfo(child_id);
-       processChildren(child_id, child_info, metadata, values, recursive);
+    if (!child_id.equals("")) {
+      DBInfo child_info = this.coll_db.getInfo(child_id);
+      if (child_info !=null) {
+        Vector<String> more_values = getMetaValuesForOID(child_id, child_info, metadata);
+        if (more_values != null) {
+          values.addAll(more_values);
+        }
+        if (recursive) {
+          processChildren(child_id, child_info, metadata, values, recursive);
+        }
+      } else {
+        logger.error("DB info was null for id "+child_id);
+      }
     }
       }