Changeset 26578 for main

Timestamp:

2012-12-13T10:25:50+13:00 (11 years ago)

Author:

sjm84

Message:

Removing a test that was causing a null pointer exception

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/CrossCollectionSearch.java (modified) (3 diffs)

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

@@ -298 +298 @@
             //metadata_message.appendChild(metadata_request);
         }
+
         Element metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, colls_sb.toString(), userContext);
         metadata_message.appendChild(metadata_request);
@@ -323 +324 @@
         }
 
-        if (valid_colls.size() == 0)
-        {
-            return false;
-        }
+        this.coll_names_map = new HashMap<String, String[]>();
+
         // ids no all has the list without 'all' option.
         this.coll_ids_list_no_all = new String[1];
@@ -337 +336 @@
         this.coll_ids_list = valid_colls.toArray(coll_ids_list);
 
-        this.coll_names_map = new HashMap<String, String[]>();
         String[] coll_names_list = new String[1];
         coll_names_list = valid_coll_names.toArray(coll_names_list);